Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[hpoussin] 30329: Limit machine name size Implement SetupDiGetDeviceInfoListDetailA Rework SetupDiGetDeviceInfoListDetailW

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 10 18:44:16 2007 New Revision: 30329 URL: http://svn.reactos.org/svn/reactos?rev=30329&view=rev Log: Limit machine name size Implement SetupDiGetDeviceInfoListDetailA Rework SetupDiGetDeviceInfoListDetailW Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sat Nov 10 18:44:16 2007 @@ -39,7 +39,7 @@ typedef struct _MACHINE_INFO { - WCHAR szMachineName[MAX_PATH]; + WCHAR szMachineName[SP_MAX_MACHINENAME_LENGTH]; RPC_BINDING_HANDLE BindingHandle; HSTRING_TABLE StringTable; BOOL bLocal; @@ -397,6 +397,11 @@ else { pMachine->bLocal = FALSE; + if (wcslen(UNCServerName) >= SP_MAX_MACHINENAME_LENGTH - 1) + { + HeapFree(GetProcessHeap(), 0, pMachine); + return CR_INVALID_MACHINENAME; + } lstrcpyW(pMachine->szMachineName, UNCServerName); pMachine->StringTable = StringTableInitialize(); Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sat Nov 10 18:44:16 2007 @@ -176,7 +176,7 @@ DWORD size; DWORD rc; CONFIGRET cr; - HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;; + HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, debugstr_w(MachineName), Reserved); @@ -189,7 +189,15 @@ size = FIELD_OFFSET(struct DeviceInfoSet, szData); if (MachineName) - size += (strlenW(MachineName) + 3) * sizeof(WCHAR); + { + SIZE_T len = strlenW(MachineName); + if (len >= SP_MAX_MACHINENAME_LENGTH - 4) + { + SetLastError(ERROR_INVALID_MACHINENAME); + goto cleanup; + } + size += (len + 3) * sizeof(WCHAR); + } list = MyMalloc(size); if (!list) { @@ -893,6 +901,90 @@ CM_Disconnect_Machine(list->hMachine); DestroyClassInstallParams(&list->ClassInstallParams); return HeapFree(GetProcessHeap(), 0, list); +} + +/*********************************************************************** + * SetupDiGetDeviceInfoListDetailA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInfoListDetailA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_LIST_DETAIL_DATA_A DevInfoData ) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + + TRACE("%p %p\n", DeviceInfoSet, DevInfoData); + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DevInfoData || + DevInfoData->cbSize != sizeof(SP_DEVINFO_LIST_DETAIL_DATA_A)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + memcpy( + &DeviceInfoListDetailData->ClassGuid, + &list->ClassGuid, + sizeof(GUID)); + DeviceInfoListDetailData->RemoteMachineHandle = list->hMachine; + if (list->MachineName) + { + FIXME("Stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + else + DeviceInfoListDetailData->RemoteMachineName[0] = 0; + + return TRUE; +} + +/*********************************************************************** + * SetupDiGetDeviceInfoListDetailW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInfoListDetailW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_LIST_DETAIL_DATA_W DevInfoData ) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + + TRACE("%p %p\n", DeviceInfoSet, DevInfoData); + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DevInfoData || + DevInfoData->cbSize != sizeof(SP_DEVINFO_LIST_DETAIL_DATA_W)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + memcpy( + &DeviceInfoListDetailData->ClassGuid, + &list->ClassGuid, + sizeof(GUID)); + DeviceInfoListDetailData->RemoteMachineHandle = list->hMachine; + if (list->MachineName) + strcpyW(DeviceInfoListDetailData->RemoteMachineName, list->MachineName + 2); + else + DeviceInfoListDetailData->RemoteMachineName[0] = 0; + + return TRUE; } /*********************************************************************** @@ -1754,46 +1846,6 @@ } /*********************************************************************** - * SetupDiGetDeviceInfoListDetailW (SETUPAPI.@) - */ -BOOL WINAPI -SetupDiGetDeviceInfoListDetailW( - IN HDEVINFO DeviceInfoSet, - OUT PSP_DEVINFO_LIST_DETAIL_DATA_W DeviceInfoListDetailData) -{ - struct DeviceInfoSet *list; - BOOL ret = FALSE; - - TRACE("%p %p\n", DeviceInfoSet, DeviceInfoListDetailData); - - if (!DeviceInfoSet) - SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) - SetLastError(ERROR_INVALID_HANDLE); - else if (!DeviceInfoListDetailData) - SetLastError(ERROR_INVALID_PARAMETER); - else if (DeviceInfoListDetailData->cbSize != sizeof(SP_DEVINFO_LIST_DETAIL_DATA_W)) - SetLastError(ERROR_INVALID_USER_BUFFER); - else - { - memcpy( - &DeviceInfoListDetailData->ClassGuid, - &list->ClassGuid, - sizeof(GUID)); - DeviceInfoListDetailData->RemoteMachineHandle = list->hMachine; - if (list->MachineName) - strcpyW(DeviceInfoListDetailData->RemoteMachineName, list->MachineName + 2); - else - DeviceInfoListDetailData->RemoteMachineName[0] = 0; - - ret = TRUE; - } - - TRACE("Returning %d\n", ret); - return ret; -} - -/*********************************************************************** * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ BOOL WINAPI Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c Sat Nov 10 18:44:16 2007 @@ -42,98 +42,21 @@ } /*********************************************************************** - * SetupDiGetDeviceInfoListDetailA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDeviceInfoListDetailA(HDEVINFO devinfo, PSP_DEVINFO_LIST_DETAIL_DATA_A devinfo_data ) -{ - FIXME("\n"); - return FALSE; -} - -/*********************************************************************** * SetupInitializeFileLogW(SETUPAPI.@) */ -HANDLE WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags) +HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags) { - FIXME("Stub %s, 0x%lx\n",debugstr_w(LogFileName),Flags); + FIXME("Stub %s, 0x%x\n",debugstr_w(LogFileName),Flags); return INVALID_HANDLE_VALUE; } /*********************************************************************** * SetupInitializeFileLogA(SETUPAPI.@) */ -HANDLE WINAPI SetupInitializeFileLogA(LPCSTR LogFileName, DWORD Flags) +HSPFILELOG WINAPI SetupInitializeFileLogA(LPCSTR LogFileName, DWORD Flags) { - FIXME("Stub %s, 0x%lx\n",debugstr_a(LogFileName),Flags); + FIXME("Stub %s, 0x%x\n",debugstr_a(LogFileName),Flags); return INVALID_HANDLE_VALUE; -} - -/*********************************************************************** - * SetupPromptReboot(SETUPAPI.@) - */ -INT WINAPI SetupPromptReboot(HSPFILEQ FileQueue, HWND Owner, BOOL ScanOnly) -{ -#if 0 - int ret; - TCHAR RebootText[RC_STRING_MAX_SIZE]; - TCHAR RebootCaption[RC_STRING_MAX_SIZE]; - INT rc = 0; - - TRACE("%p %p %d\n", FileQueue, Owner, ScanOnly); - - if (ScanOnly && !FileQueue) - { - SetLastError(ERROR_INVALID_PARAMETER); - return -1; - } - - if (FileQueue) - { - FIXME("Case 'FileQueue != NULL' not implemented\n"); - /* In some cases, do 'rc |= SPFILEQ_FILE_IN_USE' */ - } - - if (ScanOnly) - return rc; - - /* We need to ask the question to the user. */ - rc |= SPFILEQ_REBOOT_RECOMMENDED; - if (0 == LoadString(hInstance, IDS_QUERY_REBOOT_TEXT, RebootText, RC_STRING_MAX_SIZE)) - return -1; - if (0 == LoadString(hInstance, IDS_QUERY_REBOOT_CAPTION, RebootCaption, RC_STRING_MAX_SIZE)) - return -1; - ret = MessageBox(Owner, RebootText, RebootCaption, MB_YESNO | MB_DEFBUTTON1); - if (IDNO == ret) - return rc; - else - { - if (ExitWindowsEx(EWX_REBOOT, 0)) - return rc | SPFILEQ_REBOOT_IN_PROGRESS; - else - return -1; - } -#endif - FIXME("Stub %p %p %d\n", FileQueue, Owner, ScanOnly); - SetLastError(ERROR_GEN_FAILURE); - return -1; -} - -/*********************************************************************** - * SetupSetSourceListA (SETUPAPI.@) - */ -BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) -{ - FIXME("0x%08lx %p %d\n", flags, list, count); - return FALSE; -} - -/*********************************************************************** - * SetupSetSourceListW (SETUPAPI.@) - */ -BOOL WINAPI SetupSetSourceListW(DWORD flags, PCWSTR *list, UINT count) -{ - FIXME("0x%08lx %p %d\n", flags, list, count); - return FALSE; } /*********************************************************************** @@ -150,14 +73,14 @@ */ BOOL WINAPI RegistryDelnode(DWORD x, DWORD y) { - FIXME("%08lx %08lx: stub\n", x, y); + FIXME("%08x %08x: stub\n", x, y); return FALSE; } /*********************************************************************** * SetupCloseLog(SETUPAPI.@) */ -void WINAPI SetupCloseLog() +void WINAPI SetupCloseLog(void) { FIXME("() stub\n"); } @@ -165,9 +88,9 @@ /*********************************************************************** * SetupLogErrorW(SETUPAPI.@) */ -BOOL WINAPI SetupLogErrorW(PCWSTR MessageString, LogSeverity Severity) +BOOL WINAPI SetupLogErrorW(LPCWSTR MessageString, LogSeverity Severity) { - FIXME("(%s, %ld) stub\n", debugstr_w(MessageString), Severity); + FIXME("(%s, %d) stub\n", debugstr_w(MessageString), Severity); return TRUE; } @@ -178,6 +101,33 @@ { FIXME("(%d) stub\n", Reserved); return TRUE; +} + +/*********************************************************************** + * SetupPromptReboot(SETUPAPI.@) + */ +INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) +{ + FIXME("%p, %p, %d\n", file_queue, owner, scan_only); + return 0; +} + +/*********************************************************************** + * SetupSetSourceListA (SETUPAPI.@) + */ +BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) +{ + FIXME("0x%08x %p %d\n", flags, list, count); + return FALSE; +} + +/*********************************************************************** + * SetupSetSourceListW (SETUPAPI.@) + */ +BOOL WINAPI SetupSetSourceListW(DWORD flags, PCWSTR *list, UINT count) +{ + FIXME("0x%08x %p %d\n", flags, list, count); + return FALSE; } /***********************************************************************

16 years, 10 months

[greatlrd] 30328: Merge from branch ReactX to Trunk, Please make a clean build after this update Add dxg.sys driver ---------------------------------------------------------------- This driver contains all DirectX graphic APIs called by win32k. Most of them are stubbed, and the following APIs are implemented: DxDxgGenericThunk, DxDdIoctl, DriverEntry, DxDdStartupDxGraphics, DxDdCleanupDxGraphics Add dxgthk.sys driver, which is 100% finished -------------------------------------------------------

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 10 18:31:49 2007 New Revision: 30328 URL: http://svn.reactos.org/svn/reactos?rev=30328&view=rev Log: Merge from branch ReactX to Trunk, Please make a clean build after this update Add dxg.sys driver ---------------------------------------------------------------- This driver contains all DirectX graphic APIs called by win32k. Most of them are stubbed, and the following APIs are implemented: DxDxgGenericThunk, DxDdIoctl, DriverEntry, DxDdStartupDxGraphics, DxDdCleanupDxGraphics Add dxgthk.sys driver, which is 100% finished --------------------------------------------------------- The following APIs are implemented (almost all are forwarders): DriverEntry, EngAcquireSemaphore, EngAllocMem, EngAllocUserMem, EngCopyBits, EngCreateBitmap, EngCreatePalette, EngCreateSemaphore, EngDeletePalette, EngDeleteSemaphore, EngDeleteSurface, EngFindImageProcAddress, EngFreeMem, EngFreeUserMem, EngLoadImage, EngLockSurface, EngReleaseSemaphore, EngSetLastError, EngUnloadImage, EngUnlockSurface Add dxapi.sys driver -------------------------------------------------------------- Most of the APIs used by the graphic card's driver or win32k are stubs. The following APIs are implemented: DriverEntry, GsDriverEntry, DxApiGetVersion, DxApi. All APIs which DxApi wraps are stubs. Changes in win32k ------------------------------------------------------------------- Move _DC struct to include\reactos\win32k\ntgdihdl.h -------------------------------------------------------------------------- Implement NtGdiDdCanCreateD3DBuffer, NtGdiD3dContextDestroy, NtGdiD3dContextDestroyAll, NtGdiDdCreateD3DBuffer, NtGdiDdDestroyD3DBuffer, NtGdiD3dDrawPrimitives2, NtGdiDdLockD3D, NtGdiD3dValidateTextureStageState, NtGdiDdUnlockD3D, NtGdiDdCreateSurface, NtGdiDdWaitForVerticalBlank, NtGdiDdCanCreateSurface, NtGdiDdGetScanLine, NtGdiDdCreateSurfaceEx, DxDdStartupDxGraphics, NtGdiDdCreateDirectDrawObject, NtGdiDxgGenericThunk, NtGdiDdGetDriverState, NtGdiDdColorControl, NtGdiDdCreateSurfaceObject, NtGdiDdCreateSurfaceObject, NtGdiDdDeleteDirectDrawObject, NtGdiDdDeleteSurfaceObject, NtGdiDdQueryDirectDrawObject, NtGdiDdReenableDirectDrawObject, NtGdiDdGetDriverInfo, NtGdiDdGetAvailDriverMemory, NtGdiDdSetExclusiveMode, NtGdiDdFlipToGDISurface, NtGdiDdGetDC, NtGdiDdGetDxHandle, NtGdiDdReleaseDC, NtGdiDdResetVisrgn, NtGdiDdSetGammaRamp, NtGdiDdDestroySurface, NtGdiDdFlip, NtGdiDdLock, NtGdiDdUnlock, NtGdiDdBlt, NtGdiDdSetColorKey, NtGdiDdAddAttachedSurface, NtGdiDdGetBltStatus, NtGdiDdGetFlipStatus, NtGdiDdUpdateOverlay, NtGdiDdSetOverlayPosition, NtGdiDdAlphaBlt, NtGdiDdAttachSurface, NtGdiDdUnattachSurface, NtGdiDvpCanCreateVideoPort, NtGdiDvpColorControl, NtGdiDvpCreateVideoPort, NtGdiDvpDestroyVideoPort, NtGdiDvpFlipVideoPort, NtGdiDvpGetVideoPortBandwidth, NtGdiDvpGetVideoPortFlipStatus, NtGdiDvpGetVideoPortInputFormats, NtGdiDvpGetVideoPortLine, NtGdiDvpGetVideoPortOutputFormats, NtGdiDvpGetVideoPortConnectInfo, NtGdiDvpGetVideoSignalStatus, NtGdiDvpUpdateVideoPort, NtGdiDvpWaitForVideoPortSync, NtGdiDvpAcquireNotification, NtGdiDvpReleaseNotification, NtGdiDvpGetVideoPortField, NtGdiDdBeginMoCompFrame, NtGdiDdCreateMoComp, NtGdiDdDestroyMoComp, NtGdiDdEndMoCompFrame, NtGdiDdGetInternalMoCompInfo, NtGdiDdGetMoCompBuffInfo, NtGdiDdGetMoCompFormats, NtGdiDdGetMoCompGuids, NtGdiDdQueryMoCompStatus, NtGdiDdRenderMoComp, HeapVidMemAllocAligned, VidMemFree, EngAllocPrivateUserMem, EngFreePrivateUserMem, EngLockDirectDrawSurface, EngUnlockDirectDrawSurface But all those functions are stubbed in dxg.sys ---------------------------------------------------------------------------- Implemented APIsL DxEngLockDC, DxEngUnlockDC, DxEngGetDCState, EngDxIoctl ---------------------------------------------------------------------------- Stubbed APIs: DxEngNUIsTermSrv, DxEngRedrawDesktop, DxEngDispUniq, DxEngVisRgnUniq, DxEngEnumerateHdev, DxEngGetDeviceGammaRamp, DxEngCreateMemoryDC, DxEngScreenAccessCheck, DxEngLockShareSem, DxEngUnlockShareSem, DxEngLockHdev, DxEngUnlockHdev, DxEngReferenceHdev, DxEngIsHdevLockedByCurrentThread, DxEngUnreferenceHdev, DxEngSetDeviceGammaRamp, DxEngSpTearDownSprites, DxEngSpUnTearDownSprites, DxEngSpSpritesVisible, DxEngGetHdevData, DxEngSetHdevData, DxEngGetDesktopDC, DxEngDeleteDC, DxEngCleanDC, DxEngSetDCOwner, DxEngSetDCState, DxEngSelectBitmap,DxEngSetBitmapOwner, DxEngDeleteSurface, DxEngGetSurfaceData, DxEngAltLockSurface, DxEngUploadPaletteEntryToSurface, DxEngMarkSurfaceAsDirectDraw, DxEngSelectPaletteToSurface, DxEngSyncPaletteTableWithDevice, DxEngSetPaletteState, DxEngGetRedirectionBitmap, DxEngLoadImage, DxEngIncDispUniq ---------------------------------------------------------------------------- Remember we need the DxEng APIs implemented and HeapVidMemAllocAligned, VidMemFree, EngAllocPrivateUserMem, EngFreePrivateUserMem, EngLockDirectDrawSurface, EngUnlockDirectDrawSurface implemented before it's possible to have full DirectX support at kmode. Added: trunk/reactos/drivers/directx/ - copied from r30321, branches/reactx/reactos/drivers/directx/ trunk/reactos/include/reactos/drivers/directx/ - copied from r30318, branches/reactx/reactos/include/reactos/drivers/directx/ trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c (with props) trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c (with props) trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (with props) trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c (with props) trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c (with props) Removed: trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/drivers/directx/dxapi/dxapi_driver.h trunk/reactos/drivers/directx/dxapi/main.c trunk/reactos/drivers/directx/dxg/main.c trunk/reactos/drivers/drivers.rbuild trunk/reactos/include/ddk/d3dnthal.h trunk/reactos/include/ddk/ddkmapi.h trunk/reactos/include/psdk/ntgdi.h trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/driver.h trunk/reactos/subsystems/win32/win32k/include/gdifloat.h trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/win32k.def trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxap… Modified: trunk/reactos/drivers/directx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/main… Modified: trunk/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/main.c… Modified: trunk/reactos/drivers/drivers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/drivers.rbuild?rev… Modified: trunk/reactos/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dnthal.h?rev… Modified: trunk/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddkmapi.h?rev=… Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=3… Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Added: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Added: trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Added: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Added: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Added: trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Removed: trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… Modified: trunk/reactos/subsystems/win32/win32k/win32k.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

16 years, 10 months

[hpoussin] 30327: Rework SetupDiOpenDevRegKey

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 10 18:11:56 2007 New Revision: 30327 URL: http://svn.reactos.org/svn/reactos?rev=30327&view=rev Log: Rework SetupDiOpenDevRegKey Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sat Nov 10 18:11:56 2007 @@ -2366,152 +2366,6 @@ } /*********************************************************************** - * SetupDiOpenDevRegKey (SETUPAPI.@) - */ -HKEY WINAPI -SetupDiOpenDevRegKey( - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData, - IN DWORD Scope, - IN DWORD HwProfile, - IN DWORD KeyType, - IN REGSAM samDesired) -{ - struct DeviceInfoSet *list; - HKEY ret = INVALID_HANDLE_VALUE; - - TRACE("%p %p %lu %lu %lu 0x%lx\n", DeviceInfoSet, DeviceInfoData, - Scope, HwProfile, KeyType, samDesired); - - if (!DeviceInfoSet) - SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) - SetLastError(ERROR_INVALID_HANDLE); - else if (!DeviceInfoData) - SetLastError(ERROR_INVALID_PARAMETER); - else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) - SetLastError(ERROR_INVALID_USER_BUFFER); - else if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) - SetLastError(ERROR_INVALID_PARAMETER); - else if (KeyType != DIREG_DEV && KeyType != DIREG_DRV) - SetLastError(ERROR_INVALID_PARAMETER); - else - { - struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - LPWSTR DriverKey = NULL; - DWORD dwLength = 0; - DWORD dwRegType; - DWORD rc; - HKEY hHWProfileKey = INVALID_HANDLE_VALUE; - HKEY hEnumKey = NULL; - HKEY hKey = NULL; - HKEY RootKey; - - if (Scope == DICS_FLAG_GLOBAL) - RootKey = list->HKLM; - else /* Scope == DICS_FLAG_CONFIGSPECIFIC */ - { - hHWProfileKey = OpenHardwareProfileKey(list->HKLM, HwProfile, 0); - if (hHWProfileKey == INVALID_HANDLE_VALUE) - goto cleanup; - RootKey = hHWProfileKey; - } - - rc = RegOpenKeyExW( - RootKey, - REGSTR_PATH_SYSTEMENUM, - 0, /* Options */ - 0, - &hEnumKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - rc = RegOpenKeyExW( - hEnumKey, - deviceInfo->DeviceName, - 0, /* Options */ - KeyType == DIREG_DEV ? samDesired : KEY_QUERY_VALUE, - &hKey); - RegCloseKey(hEnumKey); - hEnumKey = NULL; - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - if (KeyType == DIREG_DEV) - { - /* We're done. Just return the hKey handle */ - ret = hKey; - goto cleanup; - } - /* Read the 'Driver' key */ - rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, NULL, &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - else if (dwRegType != REG_SZ) - { - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } - DriverKey = HeapAlloc(GetProcessHeap(), 0, dwLength); - if (!DriverKey) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, (LPBYTE)DriverKey, &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - RegCloseKey(hKey); - hKey = NULL; - /* Need to open the driver key */ - rc = RegOpenKeyExW( - RootKey, - REGSTR_PATH_CLASS_NT, - 0, /* Options */ - 0, - &hEnumKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - rc = RegOpenKeyExW( - hEnumKey, - DriverKey, - 0, /* Options */ - samDesired, - &hKey); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - ret = hKey; - -cleanup: - if (hHWProfileKey != INVALID_HANDLE_VALUE) - RegCloseKey(hHWProfileKey); - if (hEnumKey != NULL) - RegCloseKey(hEnumKey); - if (hKey != NULL && hKey != ret) - RegCloseKey(hKey); - } - - TRACE("Returning 0x%p\n", ret); - return ret; -} - -/*********************************************************************** * SetupDiCreateDeviceInfoA (SETUPAPI.@) */ BOOL WINAPI @@ -3554,6 +3408,171 @@ return ret; } +static HKEY SETUPDI_OpenDevKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) +{ + HKEY enumKey, key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegOpenKeyExW(RootKey, REGSTR_PATH_SYSTEMENUM, 0, 0, &enumKey); + if (!l) + { + l = RegOpenKeyExW(enumKey, devInfo->DeviceName, 0, samDesired, &key); + RegCloseKey(enumKey); + } + if (l) + SetLastError(l); + return key; +} + +static HKEY SETUPDI_OpenDrvKey(HKEY RootKey, struct DeviceInfo *devInfo, REGSAM samDesired) +{ + LPWSTR DriverKey = NULL; + DWORD dwLength = 0; + DWORD dwRegType; + DWORD rc; + HKEY hEnumKey = NULL; + HKEY hKey = NULL; + HKEY key = INVALID_HANDLE_VALUE; + + hKey = SETUPDI_OpenDevKey(RootKey, devInfo, KEY_QUERY_VALUE); + if (hKey == INVALID_HANDLE_VALUE) + goto cleanup; + /* Read the 'Driver' key */ + rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, NULL, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + else if (dwRegType != REG_SZ) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + DriverKey = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (!DriverKey) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, REGSTR_VAL_DRIVER, NULL, &dwRegType, (LPBYTE)DriverKey, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = NULL; + /* Need to open the driver key */ + rc = RegOpenKeyExW( + RootKey, + REGSTR_PATH_CLASS_NT, + 0, /* Options */ + 0, + &hEnumKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + rc = RegOpenKeyExW( + hEnumKey, + DriverKey, + 0, /* Options */ + samDesired, + &hKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + key = hKey; + +cleanup: + if (hEnumKey != NULL) + RegCloseKey(hEnumKey); + if (hKey != NULL && hKey != key) + RegCloseKey(hKey); + return key; +} + +/*********************************************************************** + * SetupDiOpenDevRegKey (SETUPAPI.@) + */ +HKEY WINAPI SetupDiOpenDevRegKey( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType, + REGSAM samDesired) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + HKEY key = INVALID_HANDLE_VALUE; + HKEY RootKey; + + TRACE("%p %p %d %d %d %x\n", DeviceInfoSet, DeviceInfoData, + Scope, HwProfile, KeyType, samDesired); + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return INVALID_HANDLE_VALUE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return INVALID_HANDLE_VALUE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) + { + SetLastError(ERROR_INVALID_FLAGS); + return INVALID_HANDLE_VALUE; + } + if (KeyType != DIREG_DEV && KeyType != DIREG_DRV) + { + SetLastError(ERROR_INVALID_FLAGS); + return INVALID_HANDLE_VALUE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (devInfo->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + if (Scope != DICS_FLAG_GLOBAL) + { + RootKey = OpenHardwareProfileKey(set->HKLM, HwProfile, 0); + if (RootKey == INVALID_HANDLE_VALUE) + return INVALID_HANDLE_VALUE; + } + else + RootKey = set->HKLM; + switch (KeyType) + { + case DIREG_DEV: + key = SETUPDI_OpenDevKey(RootKey, devInfo, samDesired); + break; + case DIREG_DRV: + key = SETUPDI_OpenDrvKey(RootKey, devInfo, samDesired); + break; + default: + WARN("unknown KeyType %d\n", KeyType); + } + if (RootKey != set->HKLM) + RegCloseKey(RootKey); + + TRACE("Returning 0x%p\n", key); + return key; +} + /*********************************************************************** * SetupDiDeleteDevRegKey (SETUPAPI.@) */

16 years, 10 months

[hpoussin] 30326: Merge some changes from Wine

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 10 17:35:21 2007 New Revision: 30326 URL: http://svn.reactos.org/svn/reactos?rev=30326&view=rev Log: Merge some changes from Wine Modified: trunk/reactos/dll/win32/setupapi/dirid.c trunk/reactos/dll/win32/setupapi/diskspace.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/query.c trunk/reactos/dll/win32/setupapi/queue.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/setupcab.c trunk/reactos/dll/win32/setupapi/stringtable.c Modified: trunk/reactos/dll/win32/setupapi/dirid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/dirid.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/dirid.c (original) +++ trunk/reactos/dll/win32/setupapi/dirid.c Sat Nov 10 17:35:21 2007 @@ -142,7 +142,7 @@ if (!SHGetSpecialFolderPathW( NULL, buffer, csidl, TRUE )) { - FIXME( "CSIDL %lx not found\n", csidl ); + FIXME( "CSIDL %x not found\n", csidl ); return get_unknown_dirid(); } len = (strlenW(buffer) + 1) * sizeof(WCHAR); @@ -199,7 +199,7 @@ new = HeapReAlloc( GetProcessHeap(), 0, user_dirids, new_size * sizeof(*new) ); else - new = HeapAlloc( GetProcessHeap(), 0, + new = HeapAlloc( GetProcessHeap(), 0, new_size * sizeof(*new) ); if (!new) return FALSE; Modified: trunk/reactos/dll/win32/setupapi/diskspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/diskspa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/diskspace.c (original) +++ trunk/reactos/dll/win32/setupapi/diskspace.c Sat Nov 10 17:35:21 2007 @@ -52,9 +52,9 @@ list = HeapAlloc(GetProcessHeap(),0,sizeof(DISKSPACELIST)); list->dwDriveCount = 0; - + ptr = drives; - + while (*ptr) { DWORD type = GetDriveTypeW(ptr); @@ -89,8 +89,8 @@ /*********************************************************************** * SetupAddInstallSectionToDiskSpaceListA (SETUPAPI.@) */ -BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, - HINF InfHandle, HINF LayoutInfHandle, +BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, + HINF InfHandle, HINF LayoutInfHandle, LPCSTR SectionName, PVOID Reserved1, UINT Reserved2) { FIXME ("Stub\n"); @@ -100,8 +100,8 @@ /*********************************************************************** * SetupQuerySpaceRequiredOnDriveA (SETUPAPI.@) */ -BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, - LPCSTR DriveSpec, LONGLONG* SpaceRequired, +BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, + LPCSTR DriveSpec, LONGLONG* SpaceRequired, PVOID Reserved1, UINT Reserved2) { WCHAR driveW[20]; @@ -115,7 +115,7 @@ lstrcatW(driveW,bkslsh); TRACE("Looking for drive %s\n",debugstr_w(driveW)); - + for (i = 0; i < list->dwDriveCount; i++) { TRACE("checking drive %s\n",debugstr_w(list->Drives[i].lpzName)); @@ -137,5 +137,5 @@ { LPDISKSPACELIST list = (LPDISKSPACELIST)DiskSpace; HeapFree(GetProcessHeap(),0,list); - return TRUE; + return TRUE; } Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Sat Nov 10 17:35:21 2007 @@ -156,9 +156,9 @@ struct files_callback_info *info = arg; if (field[0] == '@') /* special case: copy single file */ - SetupQueueDefaultCopyW( info->queue, info->layout, info->src_root, NULL, &field[1], info->copy_flags ); + SetupQueueDefaultCopyW( info->queue, info->layout ? info->layout : hinf, info->src_root, NULL, field+1, info->copy_flags ); else - SetupQueueCopySectionW( info->queue, info->src_root, info->layout, hinf, field, info->copy_flags ); + SetupQueueCopySectionW( info->queue, info->src_root, info->layout ? info->layout : hinf, hinf, field, info->copy_flags ); return TRUE; } @@ -319,7 +319,7 @@ } else RegDeleteValueW( hkey, value ); } - else RegDeleteKeyW( hkey, NULL ); + else NtDeleteKey( hkey ); return TRUE; } @@ -379,7 +379,7 @@ if (type == REG_DWORD) { DWORD dw = str ? strtoulW( str, NULL, 0 ) : 0; - TRACE( "setting dword %s to %lx\n", debugstr_w(value), dw ); + TRACE( "setting dword %s to %x\n", debugstr_w(value), dw ); RegSetValueExW( hkey, value, 0, type, (BYTE *)&dw, sizeof(dw) ); } else @@ -399,7 +399,7 @@ if (size) { if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; - TRACE( "setting binary data %s len %ld\n", debugstr_w(value), size ); + TRACE( "setting binary data %s len %d\n", debugstr_w(value), size ); SetupGetBinaryField( context, 5, data, size, NULL ); } RegSetValueExW( hkey, value, 0, type, data, size ); @@ -618,7 +618,7 @@ if (FAILED(res)) { - WARN( "calling %s in %s returned error %lx\n", entry_point, debugstr_w(path), res ); + WARN( "calling %s in %s returned error %x\n", entry_point, debugstr_w(path), res ); status.FailureCode = SPREG_REGSVR; status.Win32Error = res; goto done; @@ -642,7 +642,7 @@ if (FAILED(res)) { - WARN( "calling DllInstall in %s returned error %lx\n", debugstr_w(path), res ); + WARN( "calling DllInstall in %s returned error %x\n", debugstr_w(path), res ); status.FailureCode = SPREG_REGSVR; status.Win32Error = res; goto done; @@ -1163,7 +1163,7 @@ goto done; if (!callback( hinf, buffer, arg )) { - WARN("callback failed for %s %s err %ld\n", + WARN("callback failed for %s %s err %d\n", debugstr_w(section), debugstr_w(buffer), GetLastError() ); goto done; } @@ -1440,23 +1440,24 @@ */ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, INT show ) { - WCHAR *p, *path, section[MAX_PATH]; + WCHAR *s, *path, section[MAX_PATH]; void *callback_context; UINT mode; HINF hinf; TRACE("hwnd %p, handle %p, cmdline %s\n", hwnd, handle, debugstr_w(cmdline)); - lstrcpynW( section, cmdline, sizeof(section)/sizeof(WCHAR) ); - - if (!(p = strchrW( section, ' ' ))) return; - *p++ = 0; - while (*p == ' ') p++; - mode = atoiW( p ); - - if (!(p = strchrW( p, ' ' ))) return; - path = p + 1; - while (*path == ' ') path++; + lstrcpynW( section, cmdline, MAX_PATH ); + + if (!(s = strchrW( section, ' ' ))) return; + *s++ = 0; + while (*s == ' ') s++; + mode = atoiW( s ); + + /* quoted paths are not allowed on native, the rest of the command line is taken as the path */ + if (!(s = strchrW( s, ' ' ))) return; + while (*s == ' ') s++; + path = s; hinf = SetupOpenInfFileW( path, NULL, INF_STYLE_WIN4, NULL ); if (hinf == INVALID_HANDLE_VALUE) return; @@ -1492,26 +1493,23 @@ } } - -/*********************************************************************** - * SetupInstallServicesFromInfSectionA (SETUPAPI.@) - */ -BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF hinf, PCSTR sectionname, DWORD flags ) -{ - return SetupInstallServicesFromInfSectionExA( hinf, sectionname, flags, +/*********************************************************************** + * SetupInstallServicesFromInfSectionW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF Inf, PCWSTR SectionName, DWORD Flags) +{ + return SetupInstallServicesFromInfSectionExW( Inf, SectionName, Flags, NULL, NULL, NULL, NULL ); } - -/*********************************************************************** - * SetupInstallServicesFromInfSectionW (SETUPAPI.@) - */ -BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR sectionname, DWORD flags ) -{ - return SetupInstallServicesFromInfSectionExW( hinf, sectionname, flags, +/*********************************************************************** + * SetupInstallServicesFromInfSectionA (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DWORD Flags) +{ + return SetupInstallServicesFromInfSectionExA( Inf, SectionName, Flags, NULL, NULL, NULL, NULL ); } - /*********************************************************************** * SetupInstallServicesFromInfSectionExA (SETUPAPI.@) Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c (original) +++ trunk/reactos/dll/win32/setupapi/misc.c Sat Nov 10 17:35:21 2007 @@ -757,8 +757,7 @@ fail:; dwError = GetLastError(); - if (pOwner != NULL) - MyFree(pOwner); + MyFree(pOwner); if (hToken != NULL) CloseHandle(hToken); @@ -826,18 +825,36 @@ } -/************************************************************************** - * AssertFail [SETUPAPI.@] - * - * Display an assertion message. - * - * PARAMS - * lpFile [I] File name - * uLine [I] Line number - * lpMessage [I] Assertion message - * - * RETURNS - * Nothing +static DWORD global_flags = 0; /* FIXME: what should be in here? */ + +/*********************************************************************** + * pSetupGetGlobalFlags (SETUPAPI.@) + */ +DWORD WINAPI pSetupGetGlobalFlags(void) +{ + FIXME( "stub\n" ); + return global_flags; +} + + +/*********************************************************************** + * pSetupSetGlobalFlags (SETUPAPI.@) + */ +void WINAPI pSetupSetGlobalFlags( DWORD flags ) +{ + global_flags = flags; +} + +/*********************************************************************** + * AssertFail (SETUPAPI.@) + * + * Shows an assert fail error messagebox + * + * PARAMS + * lpFile [I] file where assert failed + * uLine [I] line number in file + * lpMessage [I] assert message + * */ VOID WINAPI AssertFail(LPSTR lpFile, UINT uLine, LPSTR lpMessage) { @@ -1280,7 +1297,7 @@ DWORD nb_chars = 0; LPSTR nameA; - TRACE("%s, %p, %lu, %p, %p, %p, %p\n", debugstr_a(source), name, len, required, + TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_a(source), name, len, required, source_size, target_size, type); if (!source || !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE; @@ -1340,7 +1357,7 @@ BOOL ret = FALSE; DWORD source_len; - TRACE("%s, %p, %lu, %p, %p, %p, %p\n", debugstr_w(source), name, len, required, + TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_w(source), name, len, required, source_size, target_size, type); if (!source) return FALSE; @@ -1464,7 +1481,7 @@ if ((error = LZCopy( src, dst )) >= 0) ret = ERROR_SUCCESS; else { - WARN("failed to decompress file %ld\n", error); + WARN("failed to decompress file %d\n", error); ret = ERROR_INVALID_DATA; } Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c (original) +++ trunk/reactos/dll/win32/setupapi/parser.c Sat Nov 10 17:35:21 2007 @@ -162,7 +162,7 @@ /* get the directory of the inf file (as counted string, not null-terminated) */ -static const WCHAR *get_inf_dir( struct inf_file *file, unsigned int *len ) +static const WCHAR *get_inf_dir( const struct inf_file *file, unsigned int *len ) { const WCHAR *p = strrchrW( file->filename, '\\' ); *len = p ? (p + 1 - file->filename) : 0; @@ -171,7 +171,7 @@ /* find a section by name */ -static int find_section( struct inf_file *file, const WCHAR *name ) +static int find_section( const struct inf_file *file, const WCHAR *name ) { unsigned int i; @@ -290,7 +290,7 @@ /* retrieve the string substitution for a directory id */ -static const WCHAR *get_dirid_subst( struct inf_file *file, int dirid, unsigned int *len ) +static const WCHAR *get_dirid_subst( const struct inf_file *file, int dirid, unsigned int *len ) { const WCHAR *ret; @@ -303,7 +303,8 @@ /* retrieve the string substitution for a given string, or NULL if not found */ /* if found, len is set to the substitution length */ -static const WCHAR *get_string_subst( struct inf_file *file, const WCHAR *str, unsigned int *len ) +static const WCHAR *get_string_subst( const struct inf_file *file, const WCHAR *str, unsigned int *len, + BOOL no_trailing_slash ) { static const WCHAR percent = '%'; @@ -340,6 +341,7 @@ dirid_str[*len] = 0; dirid = strtolW( dirid_str, &end, 10 ); if (!*end) ret = get_dirid_subst( file, dirid, len ); + if (no_trailing_slash && ret && *len && ret[*len - 1] == '\\') *len -= 1; HeapFree( GetProcessHeap(), 0, dirid_str ); return ret; } @@ -350,7 +352,7 @@ /* do string substitutions on the specified text */ /* the buffer is assumed to be large enough */ /* returns necessary length not including terminating null */ -unsigned int PARSER_string_substW( struct inf_file *file, const WCHAR *text, WCHAR *buffer, +unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, WCHAR *buffer, unsigned int size ) { const WCHAR *start, *subst, *p; @@ -374,7 +376,7 @@ else /* end of the %xx% string, find substitution */ { len = p - start - 1; - subst = get_string_subst( file, start + 1, &len ); + subst = get_string_subst( file, start + 1, &len, p[1] == '\\' ); if (!subst) { subst = start; @@ -403,7 +405,7 @@ /* do string substitutions on the specified text */ /* the buffer is assumed to be large enough */ /* returns necessary length not including terminating null */ -unsigned int PARSER_string_substA( struct inf_file *file, const WCHAR *text, char *buffer, +unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, char *buffer, unsigned int size ) { WCHAR buffW[MAX_STRING_LEN+1]; @@ -456,14 +458,14 @@ /* check if the pointer points to an end of file */ -inline static int is_eof( struct parser *parser, const WCHAR *ptr ) +inline static int is_eof( const struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z); } /* check if the pointer points to an end of line */ -inline static int is_eol( struct parser *parser, const WCHAR *ptr ) +inline static int is_eol( const struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z || *ptr == '\n'); } @@ -1044,7 +1046,7 @@ const WCHAR *dir; WCHAR *ptr, *ret; INT dirid; - unsigned int len1 = 0; + unsigned int len1; DWORD len2; if (!SetupGetIntField( context, 1, &dirid )) return NULL; @@ -1321,16 +1323,14 @@ struct inf_file *file = hinf; unsigned int i; - if (file != NULL && file != INVALID_HANDLE_VALUE) - { - for (i = 0; i < file->nb_sections; i++) - HeapFree( GetProcessHeap(), 0, file->sections[i] ); - HeapFree( GetProcessHeap(), 0, file->filename ); - HeapFree( GetProcessHeap(), 0, file->sections ); - HeapFree( GetProcessHeap(), 0, file->fields ); - HeapFree( GetProcessHeap(), 0, file->strings ); - HeapFree( GetProcessHeap(), 0, file ); - } + if (!hinf || (hinf == INVALID_HANDLE_VALUE)) return; + + for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] ); + HeapFree( GetProcessHeap(), 0, file->filename ); + HeapFree( GetProcessHeap(), 0, file->sections ); + HeapFree( GetProcessHeap(), 0, file->fields ); + HeapFree( GetProcessHeap(), 0, file->strings ); + HeapFree( GetProcessHeap(), 0, file ); } @@ -1362,16 +1362,13 @@ int section_index; LONG ret = -1; - if (hinf == NULL || hinf == INVALID_HANDLE_VALUE) - return ERROR_INVALID_PARAMETER; - for (file = hinf; file; file = file->next) { if ((section_index = find_section( file, section )) == -1) continue; if (ret == -1) ret = 0; ret += file->sections[section_index]->nb_lines; } - TRACE( "(%p,%s) returning %ld\n", hinf, debugstr_w(section), ret ); + TRACE( "(%p,%s) returning %d\n", hinf, debugstr_w(section), ret ); SetLastError( (ret == -1) ? ERROR_SECTION_NOT_FOUND : 0 ); return ret; } @@ -1403,12 +1400,6 @@ { struct inf_file *file = hinf; int section_index; - - if (hinf == NULL || hinf == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } SetLastError( ERROR_SECTION_NOT_FOUND ); for (file = hinf; file; file = file->next) @@ -1422,7 +1413,7 @@ context->Section = section_index; context->Line = index; SetLastError( 0 ); - TRACE( "(%p,%s): returning %d/%ld\n", + TRACE( "(%p,%s): returning %d/%d\n", hinf, debugstr_w(section), section_index, index ); return TRUE; } @@ -1469,12 +1460,6 @@ { struct inf_file *file; int section_index; - - if (hinf == NULL || hinf == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } SetLastError( ERROR_SECTION_NOT_FOUND ); for (file = hinf; file; file = file->next) @@ -1770,7 +1755,7 @@ } PARSER_string_substA( file, field->text, buffer, size ); - TRACE( "context %p/%p/%d/%d index %ld returning %s\n", + TRACE( "context %p/%p/%d/%d index %d returning %s\n", context->Inf, context->CurrentInf, context->Section, context->Line, index, debugstr_a(buffer) ); } @@ -1801,7 +1786,7 @@ } PARSER_string_substW( file, field->text, buffer, size ); - TRACE( "context %p/%p/%d/%d index %ld returning %s\n", + TRACE( "context %p/%p/%d/%d index %d returning %s\n", context->Inf, context->CurrentInf, context->Section, context->Line, index, debugstr_w(buffer) ); } @@ -1888,7 +1873,7 @@ } if (TRACE_ON(setupapi)) { - TRACE( "%p/%p/%d/%d index %ld returning", + TRACE( "%p/%p/%d/%d index %d returning", context->Inf, context->CurrentInf, context->Section, context->Line, index ); for (i = index; i < line->nb_fields; i++) TRACE( " %02x", buffer[i - index] ); TRACE( "\n" ); Modified: trunk/reactos/dll/win32/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/query.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/query.c (original) +++ trunk/reactos/dll/win32/setupapi/query.c Sat Nov 10 17:35:21 2007 @@ -114,7 +114,7 @@ /*********************************************************************** * SetupGetInfInformationW (SETUPAPI.@) - * + * * BUGS * Only handles the case when InfSpec is an INF handle. */ @@ -126,7 +126,7 @@ BOOL ret; DWORD infSize; - TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer, + TRACE("(%p, %d, %p, %d, %p)\n", InfSpec, SearchControl, ReturnBuffer, ReturnBufferSize, RequiredSize); if (!InfSpec) @@ -153,7 +153,7 @@ inf = search_for_inf(InfSpec, SearchControl); break; case INFINFO_INF_PATH_LIST_SEARCH: - FIXME("Unhandled search control: %ld\n", SearchControl); + FIXME("Unhandled search control: %d\n", SearchControl); if (RequiredSize) *RequiredSize = 0; @@ -214,6 +214,7 @@ if (!ReturnBuffer) { + HeapFree(GetProcessHeap(), 0, filenameW); if (ReturnBufferSize) { SetLastError(ERROR_INVALID_PARAMETER); @@ -225,6 +226,7 @@ if (size > ReturnBufferSize) { + HeapFree(GetProcessHeap(), 0, filenameW); SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } @@ -240,12 +242,12 @@ */ BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation, UINT InfIndex, PWSTR ReturnBuffer, - DWORD ReturnBufferSize, PDWORD RequiredSize) + DWORD ReturnBufferSize, PDWORD RequiredSize) { DWORD len; LPWSTR ptr; - TRACE("(%p, %u, %p, %ld, %p) Stub!\n", InfInformation, InfIndex, + TRACE("(%p, %u, %p, %d, %p) Stub!\n", InfInformation, InfIndex, ReturnBuffer, ReturnBufferSize, RequiredSize); if (!InfInformation) @@ -289,7 +291,7 @@ DWORD required; INT size; - TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(filename), source_id, + TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_a(filename), source_id, buffer, buffer_size, required_size); if (filename && *filename && !(filenameW = strdupAtoW( filename ))) @@ -330,10 +332,8 @@ WCHAR Section[MAX_PATH]; DWORD size; LPWSTR source_id; - BOOL ret; - - ret = SetupDiGetActualSectionToInstallW(hinf, source_disks_files, Section, MAX_PATH, NULL, NULL); - if (!ret) + + if (!SetupDiGetActualSectionToInstallW(hinf, source_disks_files, Section, MAX_PATH, NULL, NULL)) return NULL; if (!SetupFindFirstLineW( hinf, Section, filename, context ) && @@ -352,8 +352,7 @@ return NULL; } - ret = SetupDiGetActualSectionToInstallW(hinf, source_disks_names, Section, MAX_PATH, NULL, NULL); - if (!ret) + if (!SetupDiGetActualSectionToInstallW(hinf, source_disks_names, Section, MAX_PATH, NULL, NULL)) return NULL; if (!SetupFindFirstLineW( hinf, Section, source_id, context ) && @@ -376,7 +375,7 @@ INFCONTEXT ctx; WCHAR *end, *source_id_str; - TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(filename), source_id, + TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_w(filename), source_id, buffer, buffer_size, required_size); if (!context) context = &ctx; @@ -420,7 +419,7 @@ DWORD required; INT size; - TRACE("%p, %d, %d, %p, %lu, %p\n", hinf, source_id, info, buffer, buffer_size, + TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size, required_size); if (!SetupGetSourceInfoW( hinf, source_id, info, NULL, 0, &required )) @@ -464,15 +463,13 @@ WCHAR source_id_str[11]; static const WCHAR fmt[] = {'%','d',0}; DWORD index; - BOOL ret; - - TRACE("%p, %d, %d, %p, %lu, %p\n", hinf, source_id, info, buffer, buffer_size, + + TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size, required_size); sprintfW( source_id_str, fmt, source_id ); - ret = SetupDiGetActualSectionToInstallW(hinf, source_disks_names, Section, MAX_PATH, NULL, NULL); - if (!ret) + if (!SetupDiGetActualSectionToInstallW(hinf, source_disks_names, Section, MAX_PATH, NULL, NULL)) return FALSE; if (!SetupFindFirstLineW( hinf, Section, source_id_str, &ctx ) && @@ -517,7 +514,7 @@ DWORD required; INT size; - TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(section), buffer, + TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_a(section), buffer, buffer_size, required_size); if (section && !(sectionW = strdupAtoW( section ))) @@ -569,7 +566,7 @@ WCHAR *dir; INT size; - TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(section), buffer, + TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_w(section), buffer, buffer_size, required_size); if (context && !SetupFindFirstLineW( hinf, destination_dirs, NULL, context )) return FALSE; @@ -612,7 +609,7 @@ if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) { - ERR("incorrect OriginalFileInfo->cbSize of %lu\n", OriginalFileInfo->cbSize); + WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); SetLastError( ERROR_INVALID_USER_BUFFER ); return FALSE; } @@ -622,9 +619,9 @@ AlternativePlatformInfo, &OriginalFileInfoW); if (ret) { - WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalInfName, MAX_PATH, + WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalInfName, -1, OriginalFileInfo->OriginalInfName, MAX_PATH, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalCatalogName, MAX_PATH, + WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalCatalogName, -1, OriginalFileInfo->OriginalCatalogName, MAX_PATH, NULL, NULL); } @@ -645,16 +642,14 @@ static const WCHAR wszVersion[] = { 'V','e','r','s','i','o','n',0 }; static const WCHAR wszCatalogFile[] = { 'C','a','t','a','l','o','g','F','i','l','e',0 }; - //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - //return FALSE; - FIXME("(%p, %d, %p, %p): semi-stub\n", InfInformation, InfIndex, AlternativePlatformInfo, OriginalFileInfo); if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) { - ERR("incorrect OriginalFileInfo->cbSize of %lu\n", OriginalFileInfo->cbSize); - return ERROR_INVALID_USER_BUFFER; + WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; } inf_path = (LPWSTR)&InfInformation->VersionData[0]; Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c (original) +++ trunk/reactos/dll/win32/setupapi/queue.c Sat Nov 10 17:35:21 2007 @@ -35,15 +35,15 @@ struct file_op { - struct file_op *next; - UINT style; - WCHAR *src_root; - WCHAR *src_path; - WCHAR *src_file; - WCHAR *src_descr; - WCHAR *src_tag; - WCHAR *dst_path; - WCHAR *dst_file; + struct file_op *next; + UINT style; + WCHAR *src_root; + WCHAR *src_path; + WCHAR *src_file; + WCHAR *src_descr; + WCHAR *src_tag; + WCHAR *dst_path; + WCHAR *dst_file; PSECURITY_DESCRIPTOR dst_sd; }; @@ -207,6 +207,7 @@ case SPFILENOTIFY_RENAMEERROR: case SPFILENOTIFY_STARTCOPY: case SPFILENOTIFY_ENDCOPY: + case SPFILENOTIFY_QUEUESCAN_EX: { FILEPATHS_W *pathsW = (FILEPATHS_W *)param1; FILEPATHS_A pathsA; @@ -240,8 +241,18 @@ } break; + case SPFILENOTIFY_QUEUESCAN: + { + LPWSTR targetW = (LPWSTR)param1; + LPSTR target = strdupWtoA( targetW ); + + ret = callback_ctx->orig_handler( callback_ctx->orig_context, notification, + (UINT_PTR)target, param2 ); + HeapFree( GetProcessHeap(), 0, target ); + } + break; + case SPFILENOTIFY_NEEDMEDIA: - case SPFILENOTIFY_QUEUESCAN: FIXME("mapping for %d not implemented\n",notification); case SPFILENOTIFY_STARTQUEUE: case SPFILENOTIFY_ENDQUEUE: @@ -963,12 +974,13 @@ return ret; } -static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style) +static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, + PSP_FILE_CALLBACK_W handler, PVOID context ) { BOOL rc = FALSE; BOOL docopy = TRUE; - TRACE("copy %s to %s style 0x%lx\n",debugstr_w(source),debugstr_w(target),style); + TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style); /* before copy processing */ if (style & SP_COPY_REPLACEONLY) @@ -999,7 +1011,7 @@ VersionSizeTarget = GetFileVersionInfoSizeW((LPWSTR)target,&zero); } - TRACE("SizeTarget %li ... SizeSource %li\n",VersionSizeTarget, + TRACE("SizeTarget %i ... SizeSource %i\n",VersionSizeTarget, VersionSizeSource); if (VersionSizeSource && VersionSizeTarget) @@ -1030,20 +1042,32 @@ if (ret) { - TRACE("Versions: Source %li.%li target %li.%li\n", + FILEPATHS_W filepaths; + + TRACE("Versions: Source %i.%i target %i.%i\n", SourceInfo->dwFileVersionMS, SourceInfo->dwFileVersionLS, TargetInfo->dwFileVersionMS, TargetInfo->dwFileVersionLS); + /* used in case of notification */ + filepaths.Target = target; + filepaths.Source = source; + filepaths.Win32Error = 0; + filepaths.Flags = 0; + if (TargetInfo->dwFileVersionMS > SourceInfo->dwFileVersionMS) { - FIXME("Notify that target version is greater..\n"); - docopy = FALSE; + if (handler) + docopy = handler (context, SPFILENOTIFY_TARGETNEWER, (UINT_PTR)&filepaths, 0); + else + docopy = FALSE; } else if ((TargetInfo->dwFileVersionMS == SourceInfo->dwFileVersionMS) && (TargetInfo->dwFileVersionLS > SourceInfo->dwFileVersionLS)) { - FIXME("Notify that target version is greater..\n"); - docopy = FALSE; + if (handler) + docopy = handler (context, SPFILENOTIFY_TARGETNEWER, (UINT_PTR)&filepaths, 0); + else + docopy = FALSE; } else if ((style & SP_COPY_NEWER_ONLY) && (TargetInfo->dwFileVersionMS == @@ -1051,8 +1075,10 @@ &&(TargetInfo->dwFileVersionLS == SourceInfo->dwFileVersionLS)) { - FIXME("Notify that target version is greater..\n"); - docopy = FALSE; + if (handler) + docopy = handler (context, SPFILENOTIFY_TARGETNEWER, (UINT_PTR)&filepaths, 0); + else + docopy = FALSE; } } } @@ -1071,7 +1097,7 @@ if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE | SP_COPY_IN_USE_NEEDS_REBOOT | SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP)) { - ERR("Unsupported style(s) 0x%lx\n",style); + ERR("Unsupported style(s) 0x%x\n",style); } if (docopy) @@ -1107,7 +1133,7 @@ if (!queue->copy_queue.count && !queue->delete_queue.count && !queue->rename_queue.count) return TRUE; /* nothing to do */ - if (!handler( context, SPFILENOTIFY_STARTQUEUE, (UINT)owner, 0 )) return FALSE; + if (!handler( context, SPFILENOTIFY_STARTQUEUE, (UINT_PTR)owner, 0 )) return FALSE; /* perform deletes */ @@ -1188,7 +1214,7 @@ } } if (do_file_copyW( op_result == FILEOP_NEWPATH ? newpath : paths.Source, - paths.Target, op->style )) break; /* success */ + paths.Target, op->style, handler, context )) break; /* success */ /* try to extract it from the cabinet file */ if (op->src_tag) { @@ -1238,11 +1264,17 @@ /*********************************************************************** * SetupScanFileQueueA (SETUPAPI.@) */ -BOOL WINAPI SetupScanFileQueueA( HSPFILEQ queue, DWORD flags, HWND window, - PSP_FILE_CALLBACK_A callback, PVOID context, PDWORD result ) -{ - FIXME("stub\n"); - return FALSE; +BOOL WINAPI SetupScanFileQueueA( HSPFILEQ handle, DWORD flags, HWND window, + PSP_FILE_CALLBACK_A handler, PVOID context, PDWORD result ) +{ + struct callback_WtoA_context ctx; + + TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result); + + ctx.orig_context = context; + ctx.orig_handler = handler; + + return SetupScanFileQueueW( handle, flags, window, QUEUE_callback_WtoA, &ctx, result ); } @@ -1250,42 +1282,53 @@ * SetupScanFileQueueW (SETUPAPI.@) */ BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window, - PSP_FILE_CALLBACK_W callback, PVOID context, PDWORD result ) + PSP_FILE_CALLBACK_W handler, PVOID context, PDWORD result ) { struct file_queue *queue = handle; struct file_op *op; - BOOL allnodesprocessed = FALSE; FILEPATHS_W paths; + UINT notification = 0; + BOOL ret = FALSE; + + TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result); + + *result = FALSE; + + if (!queue->copy_queue.count) return TRUE; + + if (flags & SPQ_SCAN_USE_CALLBACK) notification = SPFILENOTIFY_QUEUESCAN; + else if (flags & SPQ_SCAN_USE_CALLBACKEX) notification = SPFILENOTIFY_QUEUESCAN_EX; + + if (flags & ~(SPQ_SCAN_USE_CALLBACK | SPQ_SCAN_USE_CALLBACKEX)) + { + FIXME("flags %x not fully implemented\n", flags); + } paths.Source = paths.Target = NULL; - *result = FALSE; - - if ( flags & (SPQ_SCAN_FILE_PRESENCE | SPQ_SCAN_FILE_VALIDITY | SPQ_SCAN_USE_CALLBACKEX | SPQ_SCAN_INFORM_USER | SPQ_SCAN_PRUNE_COPY_QUEUE /*| SPQ_SCAN_USE_CALLBACK_SIGNERINFO | SPQ_SCAN_PRUNE_DELREN*/) ) - { - FIXME( "flags ignored 0x%lx\n", flags & (SPQ_SCAN_FILE_PRESENCE | SPQ_SCAN_FILE_VALIDITY | SPQ_SCAN_USE_CALLBACKEX | SPQ_SCAN_INFORM_USER | SPQ_SCAN_PRUNE_COPY_QUEUE /*| SPQ_SCAN_USE_CALLBACK_SIGNERINFO | SPQ_SCAN_PRUNE_DELREN*/) ); - } - - if (queue->copy_queue.count) - { - for (op = queue->copy_queue.head; op; op = op->next) + + for (op = queue->copy_queue.head; op; op = op->next) + { + build_filepathsW( op, &paths ); + switch (notification) { - build_filepathsW( op, &paths ); - if (flags & SPQ_SCAN_USE_CALLBACK) - { - /* FIXME: sometimes set param 2 to SPQ_DELAYED_COPY */ - if (NO_ERROR != callback( context, SPFILENOTIFY_QUEUESCAN, (UINT)paths.Target, 0 )) - goto done; - } + case SPFILENOTIFY_QUEUESCAN: + /* FIXME: handle delay flag */ + if (handler( context, notification, (UINT_PTR)paths.Target, 0 )) goto done; + break; + case SPFILENOTIFY_QUEUESCAN_EX: + if (handler( context, notification, (UINT_PTR)&paths, 0 )) goto done; + break; + default: + ret = TRUE; goto done; } } *result = TRUE; - allnodesprocessed = TRUE; done: HeapFree( GetProcessHeap(), 0, (void *)paths.Source ); HeapFree( GetProcessHeap(), 0, (void *)paths.Target ); - return allnodesprocessed; + return ret; } @@ -1408,10 +1451,10 @@ TRACE( "end queue\n" ); return 0; case SPFILENOTIFY_STARTSUBQUEUE: - TRACE( "start subqueue %d count %d\n", param1, param2 ); + TRACE( "start subqueue %ld count %ld\n", param1, param2 ); return TRUE; case SPFILENOTIFY_ENDSUBQUEUE: - TRACE( "end subqueue %d\n", param1 ); + TRACE( "end subqueue %ld\n", param1 ); return 0; case SPFILENOTIFY_STARTDELETE: TRACE( "start delete %s\n", debugstr_a(paths->Target) ); @@ -1447,7 +1490,7 @@ TRACE( "need media\n" ); return FILEOP_SKIP; default: - FIXME( "notification %d params %x,%x\n", notification, param1, param2 ); + FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 ); break; } return 0; @@ -1472,10 +1515,10 @@ TRACE( "end queue\n" ); return 0; case SPFILENOTIFY_STARTSUBQUEUE: - TRACE( "start subqueue %d count %d\n", param1, param2 ); + TRACE( "start subqueue %ld count %ld\n", param1, param2 ); return TRUE; case SPFILENOTIFY_ENDSUBQUEUE: - TRACE( "end subqueue %d\n", param1 ); + TRACE( "end subqueue %ld\n", param1 ); return 0; case SPFILENOTIFY_STARTDELETE: TRACE( "start delete %s\n", debugstr_w(paths->Target) ); @@ -1512,7 +1555,7 @@ TRACE( "need media\n" ); return FILEOP_SKIP; default: - FIXME( "notification %d params %x,%x\n", notification, param1, param2 ); + FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 ); break; } return 0; @@ -1571,9 +1614,9 @@ * SetupCopyErrorA (SETUPAPI.@) */ -UINT WINAPI SetupCopyErrorA( HWND parent, PCSTR dialogTitle, PCSTR diskname, +UINT WINAPI SetupCopyErrorA( HWND parent, PCSTR dialogTitle, PCSTR diskname, PCSTR sourcepath, PCSTR sourcefile, PCSTR targetpath, - UINT w32error, DWORD style, PSTR pathbuffer, + UINT w32error, DWORD style, PSTR pathbuffer, DWORD buffersize, PDWORD requiredsize) { FIXME( "stub: (Error Number %d when attempting to copy file %s from %s to %s)\n", @@ -1585,12 +1628,31 @@ * SetupCopyErrorW (SETUPAPI.@) */ -UINT WINAPI SetupCopyErrorW( HWND parent, PCWSTR dialogTitle, PCWSTR diskname, +UINT WINAPI SetupCopyErrorW( HWND parent, PCWSTR dialogTitle, PCWSTR diskname, PCWSTR sourcepath, PCWSTR sourcefile, PCWSTR targetpath, - UINT w32error, DWORD style, PWSTR pathbuffer, + UINT w32error, DWORD style, PWSTR pathbuffer, DWORD buffersize, PDWORD requiredsize) { FIXME( "stub: (Error Number %d when attempting to copy file %s from %s to %s)\n", w32error, debugstr_w(sourcefile), debugstr_w(sourcepath) ,debugstr_w(targetpath)); return DPROMPT_SKIPFILE; } + +/*********************************************************************** + * pSetupGetQueueFlags (SETUPAPI.@) + */ +DWORD WINAPI pSetupGetQueueFlags( HSPFILEQ handle ) +{ + struct file_queue *queue = handle; + return queue->flags; +} + +/*********************************************************************** + * pSetupSetQueueFlags (SETUPAPI.@) + */ +BOOL WINAPI pSetupSetQueueFlags( HSPFILEQ handle, DWORD flags ) +{ + struct file_queue *queue = handle; + queue->flags = flags; + return TRUE; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sat Nov 10 17:35:21 2007 @@ -285,10 +285,14 @@ @ stdcall SetupDiCreateDevRegKeyA(ptr ptr long long long ptr str) @ stdcall SetupDiCreateDevRegKeyW(ptr ptr long long long ptr wstr) @ stdcall SetupDiCreateDeviceInfoA(ptr str ptr str ptr long ptr) -@ stdcall SetupDiCreateDeviceInfoW(ptr wstr ptr wstr ptr long ptr) @ stdcall SetupDiCreateDeviceInfoList(ptr ptr) @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr) @ stdcall SetupDiCreateDeviceInfoListExW(ptr long wstr ptr) +@ stdcall SetupDiCreateDeviceInfoW(ptr wstr ptr wstr ptr long ptr) +@ stub SetupDiCreateDeviceInterfaceA +@ stub SetupDiCreateDeviceInterfaceW +@ stub SetupDiCreateDeviceInterfaceRegKeyA +@ stub SetupDiCreateDeviceInterfaceRegKeyW @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(long ptr) @ stub SetupDiDeleteDeviceInterfaceData @@ -328,15 +332,15 @@ @ stdcall SetupDiGetDeviceInstallParamsW(ptr ptr ptr) @ stdcall SetupDiGetDeviceInstanceIdA(ptr ptr str long ptr) @ stdcall SetupDiGetDeviceInstanceIdW(ptr ptr wstr long ptr) +@ stub SetupDiGetDeviceInterfaceAlias +@ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) +@ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr 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) @ stdcall SetupDiGetDriverInfoDetailW(ptr ptr ptr ptr long ptr) @ stub SetupDiGetDriverInstallParamsA @ stdcall SetupDiGetDriverInstallParamsW(ptr ptr ptr ptr) -@ stub SetupDiGetDeviceInterfaceAlias -@ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) -@ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr) @ stub SetupDiGetHwProfileFriendlyNameA @ stub SetupDiGetHwProfileFriendlyNameExA @ stub SetupDiGetHwProfileFriendlyNameExW @@ -548,15 +552,15 @@ @ stub pSetupDestroyRunOnceNodeList @ stub pSetupDirectoryIdToPath @ stdcall pSetupGetField(ptr long) -@ stub pSetupGetGlobalFlags +@ stdcall pSetupGetGlobalFlags() @ stub pSetupGetOsLoaderDriveAndPath -@ stub pSetupGetQueueFlags +@ stdcall pSetupGetQueueFlags(ptr) @ stub pSetupGetVersionDatum @ stub pSetupGuidFromString @ stub pSetupIsGuidNull @ stub pSetupMakeSurePathExists -@ stub pSetupSetGlobalFlags -@ stub pSetupSetQueueFlags +@ stdcall pSetupSetGlobalFlags(long) +@ stdcall pSetupSetQueueFlags(ptr long) @ stub pSetupSetSystemSourceFlags @ stub pSetupStringFromGuid @ stub pSetupVerifyQueuedCatalogs Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Sat Nov 10 17:35:21 2007 @@ -242,10 +242,10 @@ struct inf_file; extern const WCHAR *DIRID_get_string( int dirid ); extern const WCHAR *PARSER_get_inf_filename( HINF hinf ); -extern unsigned int PARSER_string_substA( struct inf_file *file, const WCHAR *text, - char *buffer, unsigned int size ); -extern unsigned int PARSER_string_substW( struct inf_file *file, const WCHAR *text, - WCHAR *buffer, unsigned int size ); +extern unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, char *buffer, + unsigned int size ); +extern unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, WCHAR *buffer, + unsigned int size ); extern WCHAR *PARSER_get_src_root( HINF hinf ); extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ); Modified: trunk/reactos/dll/win32/setupapi/setupcab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupca… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupcab.c (original) +++ trunk/reactos/dll/win32/setupapi/setupcab.c Sat Nov 10 17:35:21 2007 @@ -1,4 +1,4 @@ -/* +/* * Setupapi cabinet routines * * Copyright 2003 Gregory M. Turner @@ -20,7 +20,7 @@ * * Many useful traces are commented in code, uncomment them if you have * trouble and run with WINEDEBUG=+setupapi - * + * */ #include "setupapi_private.h" @@ -87,12 +87,12 @@ static void *sc_cb_alloc(ULONG cb) { - return malloc(cb); + return HeapAlloc(GetProcessHeap(), 0, cb); } static void sc_cb_free(void *pv) { - free(pv); + HeapFree(GetProcessHeap(), 0, pv); } static INT_PTR sc_cb_open(char *pszFile, int oflag, int pmode) @@ -523,10 +523,10 @@ BOOL ret; - TRACE("(CabinetFile == %s, Reserved == %lu, MsgHandler == ^%p, Context == ^%p)\n", + TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", debugstr_a(CabinetFile), Reserved, MsgHandler, Context); - if (! LoadCABINETDll()) + if (! LoadCABINETDll()) return FALSE; memset(&my_hsc, 0, sizeof(SC_HSC_A)); @@ -588,7 +588,7 @@ DWORD fpnsize; BOOL ret; - TRACE("(CabinetFile == %s, Reserved == %lu, MsgHandler == ^%p, Context == ^%p)\n", + TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", debugstr_w(CabinetFile), Reserved, MsgHandler, Context); if (!LoadCABINETDll()) Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c Sat Nov 10 17:35:21 2007 @@ -39,8 +39,6 @@ DWORD dwMaxDataSize; } STRING_TABLE, *PSTRING_TABLE; -WCHAR empty[] = {0}; - /************************************************************************** * StringTableInitialize [SETUPAPI.@] @@ -111,11 +109,7 @@ TRACE("\n"); pStringTable = MyMalloc(sizeof(STRING_TABLE)); - if (pStringTable == NULL) - { - ERR("Invalid hStringTable!\n"); - return NULL; - } + if (pStringTable == NULL) return NULL; memset(pStringTable, 0, sizeof(STRING_TABLE)); @@ -155,7 +149,7 @@ PSTRING_TABLE pStringTable; DWORD i; - TRACE("%p\n", (PVOID)hStringTable); + TRACE("%p\n", hStringTable); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -165,18 +159,12 @@ { for (i = 0; i < pStringTable->dwMaxSlots; i++) { - if (pStringTable->pSlots[i].pString != NULL) - { - MyFree(pStringTable->pSlots[i].pString); - pStringTable->pSlots[i].pString = NULL; - } - - if (pStringTable->pSlots[i].pData != NULL) - { - MyFree(pStringTable->pSlots[i].pData); - pStringTable->pSlots[i].pData = NULL; - pStringTable->pSlots[i].dwSize = 0; - } + MyFree(pStringTable->pSlots[i].pString); + pStringTable->pSlots[i].pString = NULL; + + MyFree(pStringTable->pSlots[i].pData); + pStringTable->pSlots[i].pData = NULL; + pStringTable->pSlots[i].dwSize = 0; } MyFree(pStringTable->pSlots); @@ -214,7 +202,7 @@ PSTRING_TABLE pStringTable; DWORD i; - TRACE("%p %s %lx\n", (PVOID)hStringTable, debugstr_w(lpString), dwFlags); + TRACE("%p %s %x\n", hStringTable, debugstr_w(lpString), dwFlags); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -422,7 +410,7 @@ DWORD i; DWORD length; - TRACE("%p\n", (PVOID)hStringTable); + TRACE("%p\n", hStringTable); pSourceTable = (PSTRING_TABLE)hStringTable; if (pSourceTable == NULL) @@ -508,8 +496,8 @@ { PSTRING_TABLE pStringTable; - TRACE("%p %lx %p %lu\n", - (PVOID)hStringTable, dwId, lpExtraData, dwExtraDataSize); + TRACE("%p %x %p %u\n", + hStringTable, dwId, lpExtraData, dwExtraDataSize); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -561,7 +549,7 @@ PSTRING_TABLE pStringTable; DWORD i; - TRACE("%p %s %lx\n", (PVOID)hStringTable, debugstr_w(lpString), dwFlags); + TRACE("%p %s %x\n", hStringTable, debugstr_w(lpString), dwFlags); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -685,8 +673,8 @@ { PSTRING_TABLE pStringTable; - TRACE("%p %lx %p %lu\n", - (PVOID)hStringTable, dwId, lpExtraData, dwExtraDataSize); + TRACE("%p %x %p %u\n", + hStringTable, dwId, lpExtraData, dwExtraDataSize); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -741,8 +729,9 @@ DWORD dwId) { PSTRING_TABLE pStringTable; - - TRACE("%p %lx\n", (PVOID)hStringTable, dwId); + static WCHAR empty[] = {0}; + + TRACE("%p %x\n", hStringTable, dwId); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -783,8 +772,7 @@ DWORD dwLength; BOOL bResult = FALSE; - TRACE("%p %lx %p %p\n", - (PVOID)hStringTable, dwId, lpBuffer, lpBufferLength); + TRACE("%p %x %p %p\n", hStringTable, dwId, lpBuffer, lpBufferLength); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -829,5 +817,5 @@ VOID WINAPI StringTableTrim(HSTRING_TABLE hStringTable) { - FIXME("%p\n", (PVOID)hStringTable); -} + FIXME("%p\n", hStringTable); +}

16 years, 10 months

[hpoussin] 30325: Add a stub for SetupDiDeleteDevRegKey

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 10 17:07:45 2007 New Revision: 30325 URL: http://svn.reactos.org/svn/reactos?rev=30325&view=rev Log: Add a stub for SetupDiDeleteDevRegKey Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sat Nov 10 17:07:45 2007 @@ -3553,3 +3553,60 @@ TRACE("Returning %d\n", ret); return ret; } + +/*********************************************************************** + * SetupDiDeleteDevRegKey (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDevRegKey( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + BOOL ret = FALSE; + + TRACE("%p %p %d %d %d\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, + KeyType); + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + if (KeyType != DIREG_DEV && KeyType != DIREG_DRV) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (devInfo->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + switch (KeyType) + { + default: + WARN("unknown KeyType %d\n", KeyType); + } + return ret; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sat Nov 10 17:07:45 2007 @@ -289,7 +289,7 @@ @ stdcall SetupDiCreateDeviceInfoList(ptr ptr) @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr) @ stdcall SetupDiCreateDeviceInfoListExW(ptr long wstr ptr) -@ stub SetupDiDeleteDevRegKey +@ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(long ptr) @ stub SetupDiDeleteDeviceInterfaceData @ stdcall SetupDiDestroyClassImageList(ptr)

16 years, 10 months

[hpoussin] 30324: Rename SETUP_DEV_INFO_SET_MAGIC to SETUP_DEVICE_INFO_SET_MAGIC Rename struct DeviceInfoElement to struct DeviceInfo Add a link to DeviceInfoSet in each DeviceInfo structure (not used yet)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 10 17:04:55 2007 New Revision: 30324 URL: http://svn.reactos.org/svn/reactos?rev=30324&view=rev Log: Rename SETUP_DEV_INFO_SET_MAGIC to SETUP_DEVICE_INFO_SET_MAGIC Rename struct DeviceInfoElement to struct DeviceInfo Add a link to DeviceInfoSet in each DeviceInfo structure (not used yet) Modified: trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/driver.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/interface.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Sat Nov 10 17:04:55 2007 @@ -941,7 +941,7 @@ WCHAR KeyBuffer[MAX_PATH]; WCHAR InstancePath[MAX_PATH]; LPWSTR pEndOfInstancePath; /* Pointer into InstancePath buffer */ - struct DeviceInfoElement *deviceInfo; + struct DeviceInfo *deviceInfo; DWORD i = 0, j; DWORD dwLength, dwRegType; DWORD rc; @@ -1026,7 +1026,7 @@ } /* Add the entry to the list */ - if (!CreateDeviceInfoElement(list, InstancePath, &KeyGuid, &deviceInfo)) + if (!CreateDeviceInfo(list, InstancePath, &KeyGuid, &deviceInfo)) { rc = GetLastError(); goto cleanup; @@ -1164,7 +1164,7 @@ if (DeviceInfoSet) { list = (struct DeviceInfoSet *)DeviceInfoSet; - if (list->magic != SETUP_DEV_INFO_SET_MAGIC) + if (list->magic != SETUP_DEVICE_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); goto cleanup; @@ -2137,7 +2137,7 @@ else { PSP_PROPCHANGE_PARAMS *CurrentPropChangeParams; - struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; CurrentPropChangeParams = &deviceInfo->ClassInstallParams.PropChangeParams; if (*CurrentPropChangeParams) @@ -2188,7 +2188,7 @@ } else { - struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; CurrentAddPropertyPageData = &deviceInfo->ClassInstallParams.AddPropertyPageData; } if (*CurrentAddPropertyPageData) @@ -2233,7 +2233,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -2372,9 +2372,9 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!PropertySheetHeader) SetLastError(ERROR_INVALID_PARAMETER); Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sat Nov 10 17:04:55 2007 @@ -198,7 +198,7 @@ } ZeroMemory(list, FIELD_OFFSET(struct DeviceInfoSet, szData)); - list->magic = SETUP_DEV_INFO_SET_MAGIC; + list->magic = SETUP_DEVICE_INFO_SET_MAGIC; memcpy( &list->ClassGuid, ClassGuid ? ClassGuid : &GUID_NULL, @@ -266,7 +266,7 @@ { struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; - if (list->magic != SETUP_DEV_INFO_SET_MAGIC) + if (list->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -279,7 +279,7 @@ SetLastError(ERROR_NO_MORE_ITEMS); else { - struct DeviceInfoElement *DevInfo = CONTAINING_RECORD(ItemList, struct DeviceInfoElement, ListEntry); + struct DeviceInfo *DevInfo = CONTAINING_RECORD(ItemList, struct DeviceInfo, ListEntry); memcpy(&DeviceInfoData->ClassGuid, &DevInfo->ClassGuid, sizeof(GUID)); @@ -798,19 +798,19 @@ BOOL -CreateDeviceInfoElement( +CreateDeviceInfo( IN struct DeviceInfoSet *list, IN LPCWSTR InstancePath, IN LPCGUID pClassGuid, - OUT struct DeviceInfoElement **pDeviceInfo) + OUT struct DeviceInfo **pDeviceInfo) { DWORD size; CONFIGRET cr; - struct DeviceInfoElement *deviceInfo; + struct DeviceInfo *deviceInfo; *pDeviceInfo = NULL; - size = FIELD_OFFSET(struct DeviceInfoElement, Data) + (strlenW(InstancePath) + 1) * sizeof(WCHAR); + size = FIELD_OFFSET(struct DeviceInfo, Data) + (strlenW(InstancePath) + 1) * sizeof(WCHAR); deviceInfo = HeapAlloc(GetProcessHeap(), 0, size); if (!deviceInfo) { @@ -826,6 +826,7 @@ return FALSE; } + deviceInfo->set = list; deviceInfo->InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); strcpyW(deviceInfo->Data, InstancePath); deviceInfo->DeviceName = deviceInfo->Data; @@ -850,7 +851,7 @@ } static BOOL -DestroyDeviceInfoElement(struct DeviceInfoElement* deviceInfo) +DestroyDeviceInfo(struct DeviceInfo *deviceInfo) { PLIST_ENTRY ListEntry; struct DriverInfoElement *driverInfo; @@ -878,13 +879,13 @@ DestroyDeviceInfoSet(struct DeviceInfoSet* list) { PLIST_ENTRY ListEntry; - struct DeviceInfoElement *deviceInfo; + struct DeviceInfo *deviceInfo; while (!IsListEmpty(&list->ListHead)) { ListEntry = RemoveHeadList(&list->ListHead); - deviceInfo = CONTAINING_RECORD(ListEntry, struct DeviceInfoElement, ListEntry); - if (!DestroyDeviceInfoElement(deviceInfo)) + deviceInfo = CONTAINING_RECORD(ListEntry, struct DeviceInfo, ListEntry); + if (!DestroyDeviceInfo(deviceInfo)) return FALSE; } if (list->HKLM != HKEY_LOCAL_MACHINE) @@ -908,7 +909,7 @@ { struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; - if (list->magic == SETUP_DEV_INFO_SET_MAGIC) + if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) ret = DestroyDeviceInfoSet(list); else SetLastError(ERROR_INVALID_HANDLE); @@ -1030,7 +1031,7 @@ if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_HANDLE); - else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); @@ -1041,7 +1042,7 @@ else { struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; - struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfo *DevInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; switch (Property) { @@ -1242,7 +1243,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_HANDLE); @@ -1383,7 +1384,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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (((struct DeviceInfoSet *)DeviceInfoSet)->HKLM != HKEY_LOCAL_MACHINE) SetLastError(ERROR_INVALID_HANDLE); @@ -1737,7 +1738,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (IsEqualIID(&list->ClassGuid, &GUID_NULL)) SetLastError(ERROR_NO_ASSOCIATED_CLASS); @@ -1767,7 +1768,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoListDetailData) SetLastError(ERROR_INVALID_PARAMETER); @@ -1851,7 +1852,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -1864,7 +1865,7 @@ PSP_DEVINSTALL_PARAMS_W Source; if (DeviceInfoData) - Source = &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->InstallParams; + Source = &((struct DeviceInfo *)DeviceInfoData->Reserved)->InstallParams; else Source = &list->InstallParams; memcpy(DeviceInstallParams, Source, Source->cbSize); @@ -1947,7 +1948,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -1960,7 +1961,7 @@ PSP_DEVINSTALL_PARAMS_W Destination; if (DeviceInfoData) - Destination = &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->InstallParams; + Destination = &((struct DeviceInfo *)DeviceInfoData->Reserved)->InstallParams; else Destination = &list->InstallParams; memcpy(Destination, DeviceInstallParams, DeviceInstallParams->cbSize); @@ -2036,7 +2037,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); @@ -2048,7 +2049,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else { - struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfo *DevInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; DWORD required; required = (strlenW(DevInfo->DeviceName) + 1) * sizeof(WCHAR); @@ -2183,7 +2184,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); @@ -2223,7 +2224,7 @@ if (KeyType == DIREG_DEV) { - struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; rc = RegCreateKeyExW( RootKey, @@ -2384,7 +2385,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); @@ -2396,7 +2397,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else { - struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; LPWSTR DriverKey = NULL; DWORD dwLength = 0; DWORD dwRegType; @@ -2577,7 +2578,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!ClassGuid) SetLastError(ERROR_INVALID_PARAMETER); @@ -2620,9 +2621,9 @@ } else if (GetLastError() == ERROR_FILE_NOT_FOUND) { - struct DeviceInfoElement *deviceInfo; - - if (CreateDeviceInfoElement(list, DeviceName, ClassGuid, &deviceInfo)) + struct DeviceInfo *deviceInfo; + + if (CreateDeviceInfo(list, DeviceName, ClassGuid, &deviceInfo)) { InsertTailList(&list->ListHead, &deviceInfo->ListEntry); @@ -2722,7 +2723,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInstanceId) SetLastError(ERROR_INVALID_PARAMETER); @@ -2735,7 +2736,7 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { - struct DeviceInfoElement *deviceInfo = NULL; + struct DeviceInfo *deviceInfo = NULL; /* Search if device already exists in DeviceInfoSet. * If yes, return the existing element * If no, create a new element using information in registry @@ -2803,7 +2804,7 @@ UuidFromStringW(&szClassGuid[1], &ClassGUID); } - if (!CreateDeviceInfoElement(list, DeviceInstanceId, &ClassGUID, &deviceInfo)) + if (!CreateDeviceInfo(list, DeviceInstanceId, &ClassGUID, &deviceInfo)) goto cleanup; InsertTailList(&list->ListHead, &deviceInfo->ListEntry); @@ -2841,7 +2842,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (list->SelectedDevice == NULL) SetLastError(ERROR_NO_DEVICE_SELECTED); @@ -2879,7 +2880,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); @@ -2889,7 +2890,7 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { - list->SelectedDevice = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + list->SelectedDevice = (struct DeviceInfo *)DeviceInfoData->Reserved; ret = TRUE; } @@ -2955,7 +2956,7 @@ { #ifndef __WINESRC__ PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; - struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; NTSTATUS Status; if (((struct DeviceInfoSet *)DeviceInfoSet)->HKLM != HKEY_LOCAL_MACHINE) @@ -3003,7 +3004,7 @@ if (!DeviceInfoData) PropChange = ((struct DeviceInfoSet *)DeviceInfoSet)->ClassInstallParams.PropChangeParams; else - PropChange = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->ClassInstallParams.PropChangeParams; + PropChange = ((struct DeviceInfo *)DeviceInfoData->Reserved)->ClassInstallParams.PropChangeParams; if (!PropChange) { SetLastError(ERROR_INVALID_PARAMETER); @@ -3125,7 +3126,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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); @@ -3290,7 +3291,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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); Modified: trunk/reactos/dll/win32/setupapi/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/driver.c (original) +++ trunk/reactos/dll/win32/setupapi/driver.c Sat Nov 10 17:04:55 2007 @@ -737,7 +737,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (list->HKLM != HKEY_LOCAL_MACHINE) SetLastError(ERROR_INVALID_HANDLE); @@ -759,7 +759,7 @@ if (DeviceInfoData) { - struct DeviceInfoElement *devInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfo *devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; if (!(devInfo->CreationFlags & DICD_INHERIT_CLASSDRVS)) pDriverListHead = &devInfo->DriverListHead; } @@ -789,7 +789,7 @@ WCHAR InfFileName[MAX_PATH]; WCHAR InfFileSection[MAX_PATH]; ULONG RequiredSize; - struct DeviceInfoElement *devInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct DeviceInfo *devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; struct InfFileDetails *infFileDetails = NULL; FILETIME DriverDate; LONG rc; @@ -1217,7 +1217,7 @@ if (!DeviceInfoSet) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DriverType != SPDIT_CLASSDRIVER && DriverType != SPDIT_COMPATDRIVER) SetLastError(ERROR_INVALID_PARAMETER); @@ -1255,12 +1255,12 @@ else { SP_DEVINSTALL_PARAMS_W InstallParamsSet; - struct DeviceInfoElement *deviceInfo; + struct DeviceInfo *deviceInfo; InstallParamsSet.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); if (!SetupDiGetDeviceInstallParamsW(DeviceInfoSet, NULL, &InstallParamsSet)) goto done; - deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; while (!IsListEmpty(&deviceInfo->DriverListHead)) { ListEntry = RemoveHeadList(&deviceInfo->DriverListHead); @@ -1369,7 +1369,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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DriverType != SPDIT_CLASSDRIVER && DriverType != SPDIT_COMPATDRIVER) SetLastError(ERROR_INVALID_PARAMETER); @@ -1379,10 +1379,10 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { - struct DeviceInfoElement *devInfo = NULL; + struct DeviceInfo *devInfo = NULL; PLIST_ENTRY ItemList; if (DeviceInfoData) - devInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; if (!devInfo || (devInfo->CreationFlags & DICD_INHERIT_CLASSDRVS)) { ListHead = &((struct DeviceInfoSet *)DeviceInfoSet)->DriverListHead; @@ -1489,7 +1489,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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -1600,7 +1600,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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -1613,8 +1613,8 @@ if (DeviceInfoData) { - pDriverInfo = (struct DriverInfoElement **)&((struct DeviceInfoElement *)DeviceInfoData->Reserved)->InstallParams.Reserved; - ListHead = &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead; + pDriverInfo = (struct DriverInfoElement **)&((struct DeviceInfo *)DeviceInfoData->Reserved)->InstallParams.Reserved; + ListHead = &((struct DeviceInfo *)DeviceInfoData->Reserved)->DriverListHead; } else { @@ -1893,7 +1893,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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -2016,7 +2016,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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -2102,11 +2102,11 @@ 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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); - else if (DeviceInfoData && ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->InstallParams.Reserved == 0) + else if (DeviceInfoData && ((struct DeviceInfo *)DeviceInfoData->Reserved)->InstallParams.Reserved == 0) SetLastError(ERROR_NO_DRIVER_SELECTED); else if (!DeviceInfoData && ((struct DeviceInfoSet *)DeviceInfoSet)->InstallParams.Reserved == 0) SetLastError(ERROR_NO_DRIVER_SELECTED); Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Sat Nov 10 17:04:55 2007 @@ -1878,7 +1878,7 @@ } else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_HANDLE); - else if (DeviceInfoSet && (list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if (DeviceInfoSet && (list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c (original) +++ trunk/reactos/dll/win32/setupapi/interface.c Sat Nov 10 17:04:55 2007 @@ -34,7 +34,7 @@ static BOOL CreateDeviceInterface( - IN struct DeviceInfoElement* deviceInfo, + IN struct DeviceInfo* deviceInfo, IN LPCWSTR SymbolicLink, IN LPCGUID pInterfaceGuid, OUT struct DeviceInterface **pDeviceInterface) @@ -89,7 +89,7 @@ DWORD dwRegType; DWORD LinkedValue; GUID ClassGuid; - struct DeviceInfoElement *deviceInfo; + struct DeviceInfo *deviceInfo; hInterfaceKey = INVALID_HANDLE_VALUE; hDeviceInstanceKey = NULL; @@ -223,7 +223,7 @@ /* We have found a device */ /* Step 1. Create a device info element */ - if (!CreateDeviceInfoElement(list, InstancePath, &ClassGuid, &deviceInfo)) + if (!CreateDeviceInfo(list, InstancePath, &ClassGuid, &deviceInfo)) { rc = GetLastError(); goto cleanup; @@ -314,15 +314,15 @@ { struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; - if (list->magic == SETUP_DEV_INFO_SET_MAGIC) + if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) { PLIST_ENTRY ItemList = list->ListHead.Flink; BOOL Found = FALSE; while (ItemList != &list->ListHead && !Found) { PLIST_ENTRY InterfaceListEntry; - struct DeviceInfoElement *DevInfo = CONTAINING_RECORD(ItemList, struct DeviceInfoElement, ListEntry); - if (DeviceInfoData && (struct DeviceInfoElement *)DeviceInfoData->Reserved != DevInfo) + struct DeviceInfo *DevInfo = CONTAINING_RECORD(ItemList, struct DeviceInfo, ListEntry); + if (DeviceInfoData && (struct DeviceInfo *)DeviceInfoData->Reserved != DevInfo) { /* We are not searching for this element */ ItemList = ItemList->Flink; @@ -386,7 +386,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 (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); @@ -579,7 +579,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Sat Nov 10 17:04:55 2007 @@ -50,15 +50,15 @@ #undef __WINESRC__ #endif -#define SETUP_DEV_INFO_SET_MAGIC 0xd00ff057 +#define SETUP_DEVICE_INFO_SET_MAGIC 0xd00ff057 #define SETUP_CLASS_IMAGE_LIST_MAGIC 0xd00ff058 -struct DeviceInterface /* Element of DeviceInfoElement.InterfaceListHead */ +struct DeviceInterface /* Element of DeviceInfo.InterfaceListHead */ { LIST_ENTRY ListEntry; /* Link to is parent device */ - struct DeviceInfoElement* DeviceInfo; + struct DeviceInfo *DeviceInfo; GUID InterfaceClassGuid; @@ -68,8 +68,8 @@ */ DWORD Flags; - /* Contains the symbolic link of this interface, for example - * \\?\ACPI#PNP0501#4&2658d0a0&0#{GUID} */ + /* Contains the symbolic link of this interface, for example + * \\?\ACPI#PNP0501#4&2658d0a0&0#{GUID} */ WCHAR SymbolicLink[ANYSIZE_ARRAY]; }; @@ -90,11 +90,11 @@ * Points into szData at then end of the structure */ PCWSTR FileName; - /* Variable size array (contains data for DirectoryName and FileName) */ + /* Variable size array (contains data for DirectoryName and FileName) */ WCHAR szData[ANYSIZE_ARRAY]; }; -struct DriverInfoElement /* Element of DeviceInfoSet.DriverListHead and DeviceInfoElement.DriverListHead */ +struct DriverInfoElement /* Element of DeviceInfoSet.DriverListHead and DeviceInfo.DriverListHead */ { LIST_ENTRY ListEntry; @@ -113,11 +113,14 @@ PSP_ADDPROPERTYPAGE_DATA AddPropertyPageData; }; -struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */ +struct DeviceInfo /* Element of DeviceInfoSet.ListHead */ { LIST_ENTRY ListEntry; /* Used when dealing with CM_* functions */ DEVINST dnDevInst; + + /* Link to parent DeviceInfoSet */ + struct DeviceInfoSet *set; /* Reserved Field of SP_DEVINSTALL_PARAMS_W structure * points to a struct DriverInfoElement */ @@ -164,13 +167,13 @@ /* Used by SetupDiGetClassInstallParamsW/SetupDiSetClassInstallParamsW */ struct ClassInstallParams ClassInstallParams; - /* Variable size array (contains data for DeviceName, UniqueId, DeviceDescription) */ + /* Variable size array (contains data for DeviceName, UniqueId, DeviceDescription) */ WCHAR Data[ANYSIZE_ARRAY]; }; struct DeviceInfoSet /* HDEVINFO */ { - DWORD magic; /* SETUP_DEV_INFO_SET_MAGIC */ + DWORD magic; /* SETUP_DEVICE_INFO_SET_MAGIC */ /* If != GUID_NULL, only devices of this class can be in the device info set */ GUID ClassGuid; /* Local or distant HKEY_LOCAL_MACHINE registry key */ @@ -185,9 +188,9 @@ * searched/detected, this list is empty) */ LIST_ENTRY DriverListHead; - /* List of struct DeviceInfoElement */ + /* List of struct DeviceInfo */ LIST_ENTRY ListHead; - struct DeviceInfoElement *SelectedDevice; + struct DeviceInfo *SelectedDevice; /* Used by SetupDiGetClassInstallParamsW/SetupDiSetClassInstallParamsW */ struct ClassInstallParams ClassInstallParams; @@ -266,11 +269,11 @@ /* devinst.c */ BOOL -CreateDeviceInfoElement( +CreateDeviceInfo( IN struct DeviceInfoSet *list, IN LPCWSTR InstancePath, IN LPCGUID pClassGuid, - OUT struct DeviceInfoElement **pDeviceInfo); + OUT struct DeviceInfo **pDeviceInfo); /* driver.c */

16 years, 10 months

[fireball] 30323: - Fix a bug. ( jz -> js, a typo)

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 10 16:02:04 2007 New Revision: 30323 URL: http://svn.reactos.org/svn/reactos?rev=30323&view=rev Log: - Fix a bug. ( jz -> js, a typo) Modified: trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s Modified: trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except_nt/i386… ============================================================================== --- trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s (original) +++ trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s Sat Nov 10 16:02:04 2007 @@ -233,7 +233,7 @@ mov ebx, [ebp+12] or eax, eax jz except_continue2 - jz except_dismiss2 + js except_dismiss2 /* So this is an accept, call the termination handlers */ mov edi, [ebx+8] @@ -365,7 +365,7 @@ mov ebx, [ebp+12] or eax, eax jz except_continue3 - jz except_dismiss3 + js except_dismiss3 /* So this is an accept, call the termination handlers */ mov edi, [ebx+8]

16 years, 10 months

[fireball] 30322: - Fix russian translation, by towerr.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 10 15:34:55 2007 New Revision: 30322 URL: http://svn.reactos.org/svn/reactos?rev=30322&view=rev Log: - Fix russian translation, by towerr. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc Sat Nov 10 15:34:55 2007 @@ -4,21 +4,21 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ" +CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS" FONT 8,"MS Sans Serif",0,0 BEGIN LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", 0x0, 10, 107, 100, 15 - LTEXT "Öâåò Ôîíà", 0x0, 10, 10, 75, 12 + LTEXT "Öâåò ôîíà", 0x0, 10, 10, 75, 12 COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Öâåò Øðèôòà", 0x0, 10, 35, 75, 12 + LTEXT "Öâåò øðèôòà", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "\n\nÏðèìåð òåêñòà", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 - CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 - CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 - CONTROL "Èñïîëüçîâàòü CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 - CONTROL "Ñîêðàùàòü Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 - CONTROL "Âûáîð êàòàëîãà äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 - CONTROL "Âûáîð êàòàëîãà äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + CONTROL "Ïîêàçûâàòü âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + CONTROL "Èñïîëüçîâàòü êýøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 + CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 + CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP @@ -29,7 +29,7 @@ PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP - CONTROL "Ïðèâåòñòâèå!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 + CONTROL "Ââåäåíèå", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE @@ -40,7 +40,7 @@ CLR3, "Àêâà" CLR4, "Êðàñíûé" CLR5, "Ïóðïóðíûé" - CLR6, "Æîëòûé" + CLR6, "Æ¸ëòûé" CLR7, "Áåëûé" CLR8, "Ñåðûé" CLR9, "Ñâåòëî-ãîëóáîé" @@ -48,14 +48,14 @@ CLR11, "Ñâåòëî-àêâà" CLR12, "ßðêî-êðàñíûé" CLR13, "Ñâåòëî-ïóðïóðíûé" - CLR14, "ßðêî-æåëòûé" + CLR14, "ßðêî-æ¸ëòûé" CLR15, "ßðêî-áåëûé" - MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íåíàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè." + MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íå íàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè." MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd" MSG_DIREFAILED, "Íåâîçìîæíî ñîçäàòü ïàïêó äëÿ ëîãîâ!" MSG_SETLOADSUC, "Ðàíåå ñîõðàíåííûå íàñòðîéêè çàãðóæåíû." - MSG_FINDLOGDIR, "Âûáåðèòå êàòàëîã ñîõðàíåíèÿ ëîã-ôàéëîâ:" - MSG_FINDMGWDIR, "Óêàæèòå êàòàëîã ðàñïîëîæåíèÿ Êîìïèëÿòîðà MingW:" - MSG_FINDOBJDIR, "Âûáåðèòå êàòàëîã ñîõðàíåíèÿ îáúåêòíûõ ôàéëîâ:" - MSG_FINDOUTDIR, "Âûáåðèòå êàòàëîã ñîõðàíåíèÿ îòêîìïèëèðîâàííûõ ôàéëîâ:" + MSG_FINDLOGDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ ëîã-ôàéëîâ:" + MSG_FINDMGWDIR, "Óêàæèòå êàòàëîã ðàñïîëîæåíèÿ êîìïèëÿòîðà MinGW:" + MSG_FINDOBJDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ îáúåêòíûõ ôàéëîâ:" + MSG_FINDOUTDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ êîìïèëèðîâàííûõ ôàéëîâ:" END

16 years, 10 months

[janderwald] 30321: - fix a bug

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Nov 10 14:23:01 2007 New Revision: 30321 URL: http://svn.reactos.org/svn/reactos?rev=30321&view=rev Log: - fix a bug Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_new.c Sat Nov 10 14:23:01 2007 @@ -278,7 +278,7 @@ szBuffer[199] = 0; mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.fType = MFT_STRING; - mii.dwTypeData = szNew; + mii.dwTypeData = szBuffer; mii.cch = strlenW(mii.dwTypeData); mii.wID = idFirst++; InsertMenuItemW(hMenu, idMenu++, TRUE, &mii);

16 years, 10 months

[fireball] 30320: - scsi.inf made by hpoussin, to address the issue in bug 2631. See issue #2631 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 10 14:21:08 2007 New Revision: 30320 URL: http://svn.reactos.org/svn/reactos?rev=30320&view=rev Log: - scsi.inf made by hpoussin, to address the issue in bug 2631. See issue #2631 for more details. Modified: trunk/reactos/media/inf/scsi.inf Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=303… ============================================================================== --- trunk/reactos/media/inf/scsi.inf (original) +++ trunk/reactos/media/inf/scsi.inf Sat Nov 10 14:21:08 2007 @@ -1,25 +1,62 @@ ; SCSI.INF ; -; Installation file for the SCSI class +; Installation file for SCSI class and SCSI hardware ; [Version] Signature = "$Windows NT$" ;Signature = "$ReactOS$" LayoutFile = layout.inf - + Class = SCSIAdapter ClassGUID = {4D36E97B-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/19/1999,5.00.2157.1 - -[ClassInstall32.NT] -AddReg = SCSIClass.NT.AddReg - -[SCSIClass.NT.AddReg] -HKR, , , 0, %SCSIClassName% -HKR, , Icon, 0, "-10" -;HKR, , Installer32, 0, "syssetup.dll,ScsiClassInstaller" - +DriverVer = 11/2/2007,1.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%PCI\VEN_104B&CC_0100.DeviceDesc% = BusLogic_Inst,PCI\VEN_104B&CC_0100 + +;----------------------------- ScsiPort Driver ---------------------------- + +[Scsiport_CopyFiles.NT] +scsiport.sys + +[Scsiport_Service_Inst] +ServiceType = 4 +StartType = 0 +ErrorControl = 0 +ServiceBinary = %12%\scsiport.sys +LoadOrderGroup = SCSI Port + +;----------------------------- BusLogic Driver ---------------------------- + +[BusLogic_Inst.NT] +CopyFiles = BusLogic_CopyFiles.NT, Scsiport_CopyFiles.NT + +[BusLogic_CopyFiles.NT] +buslogic.sys + +[BusLogic_Inst.NT.Services] +AddService = BusLogic, 0x00000002, BusLogic_Service_Inst +AddService = Scsiport, , Scsiport_Service_Inst + +[BusLogic_Service_Inst] +ServiceType = 0 +StartType = 0 +ErrorControl = 0 +ServiceBinary = %12%\buslogic.sys +LoadOrderGroup = SCSI Miniport + +;--------------------------------- Strings --------------------------------- + [Strings] ReactOS = "ReactOS Team" -SCSIClassName = "SCSI- and RAID-Controller" +SCSIClassName = "SCSI and RAID Controllers" + +GenericMfg = "(Standard SCSI and RAID controllers)" +PCI\VEN_104B&CC_0100.DeviceDesc = "BusLogic SCSI Controller"

16 years, 10 months

← Newer
1
...
57
58
59
60
61
62
63
...
89
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007