Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 39709: - Don't direct call IsUserAnAdmin (setupapi in Windows not linked with shell32) - Implement IsUserAdmin in setupapi (based on shell32 implementation) - Implement pSetupIsUserAdmin
by dchapyshev＠svn.reactos.org 22 Feb '09

22 Feb '09

Author: dchapyshev Date: Sun Feb 22 15:49:18 2009 New Revision: 39709 URL: http://svn.reactos.org/svn/reactos?rev=39709&view=rev Log: - Don't direct call IsUserAnAdmin (setupapi in Windows not linked with shell32) - Implement IsUserAdmin in setupapi (based on shell32 implementation) - Implement pSetupIsUserAdmin Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/setupapi.spec 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sun Feb 22 15:49:18 2009 @@ -153,7 +153,7 @@ if (!PnpGetLocalHandles(&BindingHandle, NULL)) return CR_FAILURE; - bAdmin = IsUserAnAdmin(); + bAdmin = IsUserAdmin(); for (i = 0; i < 30; i++) { @@ -209,7 +209,7 @@ FIXME("%p %p %lu %lx %p\n", plcLogConf, dnDevInst, Priority, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (plcLogConf == NULL) @@ -336,7 +336,7 @@ TRACE("%p %s %lx %p\n", dnDevInst, debugstr_w(pszID), ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -543,7 +543,7 @@ FIXME("%p %s %p %lx %p\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (pdnDevInst == NULL) @@ -713,7 +713,7 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -812,7 +812,7 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -1079,7 +1079,7 @@ TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed; @@ -3008,7 +3008,7 @@ FIXME("%lx %lx %lx %lx\n", dnFromDevInst, dnToDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnFromDevInst == 0 || dnToDevInst == 0) @@ -3385,7 +3385,7 @@ TRACE("%lx %lx\n", ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (ulFlags & ~CM_DETECT_BITS) @@ -3903,7 +3903,7 @@ FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Sun Feb 22 15:49:18 2009 @@ -1685,3 +1685,71 @@ { return IsEqualGUID(lpGUID, &GUID_NULL); } + +/* + * implemented + */ +BOOL +WINAPI +IsUserAdmin(VOID) +{ + SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; + HANDLE hToken; + DWORD dwSize; + PTOKEN_GROUPS lpGroups; + PSID lpSid; + DWORD i; + BOOL bResult = FALSE; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + CloseHandle(hToken); + return FALSE; + } + } + + lpGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (lpGroups == NULL) + { + CloseHandle(hToken); + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + + if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &lpSid)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + return FALSE; + } + + for (i = 0; i < lpGroups->GroupCount; i++) + { + if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) + { + bResult = TRUE; + break; + } + } + + FreeSid(lpSid); + HeapFree(GetProcessHeap(), 0, lpGroups); + + return bResult; +} 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Feb 22 15:49:18 2009 @@ -213,7 +213,7 @@ @ stdcall InstallHinfSection(long long str long) InstallHinfSectionA @ stdcall InstallHinfSectionA(long long str long) @ stdcall InstallHinfSectionW(long long wstr long) -@ stdcall IsUserAdmin() shell32.IsUserAnAdmin +@ stdcall IsUserAdmin() @ stdcall MyFree(ptr) @ stdcall MyMalloc(long) @ stdcall MyRealloc(ptr long) @@ -566,7 +566,7 @@ @ stub pSetupInstallStopEx @ stdcall pSetupIsGuidNull(ptr) @ stub pSetupIsLocalSystem -@ stub pSetupIsUserAdmin +@ stdcall pSetupIsUserAdmin() IsUserAdmin @ stub pSetupMakeSurePathExists @ stub pSetupMalloc @ stub pSetupModifyGlobalFlags

1 0

[dchapyshev] 39708: - List of exported functions like Win2003 SP1
by dchapyshev＠svn.reactos.org 22 Feb '09

22 Feb '09

Author: dchapyshev Date: Sun Feb 22 15:20:43 2009 New Revision: 39708 URL: http://svn.reactos.org/svn/reactos?rev=39708&view=rev Log: - List of exported functions like Win2003 SP1 Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Feb 22 15:20:43 2009 @@ -1,8 +1,6 @@ -@ stub AcquireSCMLock -@ stub AddMiniIconToList -@ stub AddTagToGroupOrderListEntry -@ stub AppendStringToMultiSz -@ stdcall AssertFail(str long str) +# Functions exported by Win2003 SP1 +@ stub CMP_GetBlockedDriverInfo +@ stub CMP_GetServerSideDeviceInstallFlags @ stdcall CMP_Init_Detection(long) @ stub CMP_RegisterNotification @ stdcall CMP_Report_LogOn(long long) @@ -53,6 +51,7 @@ @ stub CM_Free_Res_Des @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle +@ stub CM_Free_Resource_Conflict_Handle @ stdcall CM_Get_Child(ptr long long) @ stdcall CM_Get_Child_Ex(ptr long long long) @ stdcall CM_Get_Class_Key_NameA(ptr str ptr long) @@ -63,8 +62,14 @@ @ stdcall CM_Get_Class_NameW(ptr wstr ptr long) @ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long) @ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long) +@ stub CM_Get_Class_Registry_PropertyA +@ stub CM_Get_Class_Registry_PropertyW @ stdcall CM_Get_Depth(ptr long long) @ stdcall CM_Get_Depth_Ex(ptr long long long) +@ stub CM_Get_DevNode_Custom_PropertyA +@ stub CM_Get_DevNode_Custom_PropertyW +@ stub CM_Get_DevNode_Custom_Property_ExA +@ stub CM_Get_DevNode_Custom_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long long) @@ -121,6 +126,9 @@ @ stub CM_Get_Res_Des_Data_Ex @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex +@ stub CM_Get_Resource_Conflict_Count +@ stub CM_Get_Resource_Conflict_DetailsA +@ stub CM_Get_Resource_Conflict_DetailsW @ stdcall CM_Get_Sibling(ptr long long) @ stdcall CM_Get_Sibling_Ex(ptr long long long) @ stdcall CM_Get_Version() @@ -129,6 +137,8 @@ @ stub CM_Invert_Range_List @ stdcall CM_Is_Dock_Station_Present(ptr) @ stdcall CM_Is_Dock_Station_Present_Ex(ptr long) +@ stub CM_Is_Version_Available +@ stub CM_Is_Version_Available_Ex @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stdcall CM_Locate_DevNode_ExA(ptr str long long) @@ -145,12 +155,17 @@ @ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long long) @ stdcall CM_Open_DevNode_Key(ptr long long long ptr long) @ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long long) +@ stub CM_Query_And_Remove_SubTreeA +@ stub CM_Query_And_Remove_SubTreeW +@ stub CM_Query_And_Remove_SubTree_ExA +@ stub CM_Query_And_Remove_SubTree_ExW @ stub CM_Query_Arbitrator_Free_Data @ stub CM_Query_Arbitrator_Free_Data_Ex @ stub CM_Query_Arbitrator_Free_Size @ stub CM_Query_Arbitrator_Free_Size_Ex @ stub CM_Query_Remove_SubTree @ stub CM_Query_Remove_SubTree_Ex +@ stub CM_Query_Resource_Conflict_List @ stdcall CM_Reenumerate_DevNode(long long) @ stdcall CM_Reenumerate_DevNode_Ex(long long long) @ stub CM_Register_Device_Driver @@ -161,16 +176,16 @@ @ stub CM_Register_Device_Interface_ExW @ stub CM_Remove_SubTree @ stub CM_Remove_SubTree_Ex -@ stub CM_Remove_Unmarked_Children -@ stub CM_Remove_Unmarked_Children_Ex @ stub CM_Request_Device_EjectA @ stub CM_Request_Device_EjectW +@ stub CM_Request_Device_Eject_ExA +@ stub CM_Request_Device_Eject_ExW @ stdcall CM_Request_Eject_PC() @ stdcall CM_Request_Eject_PC_Ex(long) -@ stub CM_Reset_Children_Marks -@ stub CM_Reset_Children_Marks_Ex @ stdcall CM_Run_Detection(long) @ stdcall CM_Run_Detection_Ex(long long) +@ stub CM_Set_Class_Registry_PropertyA +@ stub CM_Set_Class_Registry_PropertyW @ stdcall CM_Set_DevNode_Problem(long long long) @ stdcall CM_Set_DevNode_Problem_Ex(long long long long) @ stdcall CM_Set_DevNode_Registry_PropertyA(long long ptr long long) @@ -192,50 +207,16 @@ @ stub CM_Unregister_Device_InterfaceW @ stub CM_Unregister_Device_Interface_ExA @ stub CM_Unregister_Device_Interface_ExW -@ stdcall CaptureAndConvertAnsiArg(str ptr) -@ stdcall CaptureStringArg(wstr ptr) -@ stdcall CenterWindowRelativeToParent(long) -@ stdcall ConcatenatePaths(wstr wstr long ptr) -@ stdcall DelayedMove(wstr wstr) -@ stub DelimStringToMultiSz -@ stub DestroyTextFileReadBuffer @ stdcall DoesUserHavePrivilege(wstr) -@ stdcall DuplicateString(wstr) -@ stdcall EnablePrivilege(wstr long) @ stub ExtensionPropSheetPageProc -@ stdcall FileExists(wstr ptr) -@ stub FreeStringArray -@ stub GetCurrentDriverSigningPolicy -@ stub GetNewInfName -@ stdcall GetSetFileTimestamp(wstr ptr ptr ptr long) -@ stdcall GetVersionInfoFromImage(wstr ptr ptr) -@ stub InfIsFromOemLocation @ stdcall InstallCatalog(str str ptr) @ stdcall InstallHinfSection(long long str long) InstallHinfSectionA @ stdcall InstallHinfSectionA(long long str long) @ stdcall InstallHinfSectionW(long long wstr long) -@ stub InstallStop -@ stub InstallStopEx @ stdcall IsUserAdmin() shell32.IsUserAnAdmin -@ stub LookUpStringInTable -@ stub MemoryInitialize -@ stdcall MultiByteToUnicode(str long) -@ stub MultiSzFromSearchControl @ stdcall MyFree(ptr) -@ stdcall MyGetFileTitle(wstr) @ stdcall MyMalloc(long) @ stdcall MyRealloc(ptr long) -@ stdcall OpenAndMapFileForRead(wstr ptr ptr ptr ptr) -@ stub OutOfMemory -@ stub QueryMultiSzValueToArray -@ stdcall QueryRegistryValue(long wstr ptr ptr ptr) -@ stub ReadAsciiOrUnicodeTextFile -@ stdcall RegistryDelnode(long long) -# Yes, Microsoft really misspelled this one! -@ stdcall RetreiveFileSecurity(wstr ptr) -@ stub RetrieveServiceConfig -@ stub SearchForInfFile -@ stub SetArrayToMultiSzValue @ stdcall SetupAddInstallSectionToDiskSpaceListA(long long long str ptr long) @ stub SetupAddInstallSectionToDiskSpaceListW @ stub SetupAddSectionToDiskSpaceListA @@ -246,12 +227,17 @@ @ stub SetupAddToSourceListW @ stub SetupAdjustDiskSpaceListA @ stub SetupAdjustDiskSpaceListW +@ stub SetupBackupErrorA +@ stub SetupBackupErrorW @ stub SetupCancelTemporarySourceList @ stdcall SetupCloseFileQueue(ptr) @ stdcall SetupCloseInfFile(long) @ stdcall SetupCloseLog() +@ stdcall SetupCommitFileQueue(long long ptr ptr) SetupCommitFileQueueA @ stdcall SetupCommitFileQueueA(long long ptr ptr) @ stdcall SetupCommitFileQueueW(long long ptr ptr) +@ stub SetupConfigureWmiFromInfSectionA +@ stub SetupConfigureWmiFromInfSectionW @ stdcall SetupCopyErrorA(long str str str str str long long str long ptr) @ stdcall SetupCopyErrorW(long wstr wstr wstr wstr wstr long long wstr long ptr) @ stdcall SetupCopyOEMInfA(str str long long ptr long ptr ptr) @@ -260,7 +246,7 @@ @ stdcall SetupCreateDiskSpaceListW(ptr long long) @ stdcall SetupDecompressOrCopyFileA(str str ptr) @ stdcall SetupDecompressOrCopyFileW(wstr wstr ptr) -@ stub SetupDefaultQueueCallback +@ stdcall SetupDefaultQueueCallback(ptr long long long) SetupDefaultQueueCallbackA @ stdcall SetupDefaultQueueCallbackA(ptr long long long) @ stdcall SetupDefaultQueueCallbackW(ptr long long long) @ stdcall SetupDeleteErrorA(long str str long long) @@ -290,9 +276,9 @@ @ stdcall SetupDiCreateDeviceInfoListExW(ptr long wstr ptr) @ stdcall SetupDiCreateDeviceInfoW(ptr wstr ptr wstr ptr long ptr) @ stdcall SetupDiCreateDeviceInterfaceA(ptr ptr ptr str long ptr) -@ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr) @ stdcall SetupDiCreateDeviceInterfaceRegKeyA(ptr ptr long long ptr ptr) @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr ptr) +@ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(long ptr) @ stub SetupDiDeleteDeviceInterfaceData @@ -305,6 +291,8 @@ @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) @ stdcall SetupDiEnumDriverInfoA(long ptr long long ptr) @ stdcall SetupDiEnumDriverInfoW(long ptr long long ptr) +@ stub SetupDiGetActualModelsSectionA +@ stub SetupDiGetActualModelsSectionW @ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) @ stdcall SetupDiGetActualSectionToInstallExA(long str ptr str long ptr ptr ptr) @ stdcall SetupDiGetActualSectionToInstallExW(long wstr ptr wstr long ptr ptr ptr) @@ -326,6 +314,10 @@ @ stdcall SetupDiGetClassImageListExW(ptr wstr ptr) @ stdcall SetupDiGetClassInstallParamsA(ptr ptr ptr long ptr) @ stdcall SetupDiGetClassInstallParamsW(ptr ptr ptr long ptr) +@ stub SetupDiGetClassRegistryPropertyA +@ stub SetupDiGetClassRegistryPropertyW +@ stub SetupDiGetCustomDevicePropertyA +@ stub SetupDiGetCustomDevicePropertyW @ stdcall SetupDiGetDeviceInfoListClass(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) @@ -377,13 +369,17 @@ @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) @ stub SetupDiRemoveDeviceInterface +@ stub SetupDiRestartDevices @ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stdcall SetupDiSelectDevice(ptr ptr) @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) @ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long) +@ stub SetupDiSetClassRegistryPropertyA +@ stub SetupDiSetClassRegistryPropertyW @ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr) @ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) +@ stub SetupDiSetDeviceInterfaceDefault @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr long) @ stub SetupDiSetDriverInstallParamsA @@ -394,6 +390,8 @@ @ stdcall SetupDiUnremoveDevice(ptr ptr) @ stub SetupDuplicateDiskSpaceListA @ stub SetupDuplicateDiskSpaceListW +@ stub SetupEnumInfSectionsA +@ stub SetupEnumInfSectionsW @ stdcall SetupFindFirstLineA(long str str ptr) @ stdcall SetupFindFirstLineW(long wstr wstr ptr) @ stdcall SetupFindNextLine(ptr ptr) @@ -425,6 +423,7 @@ @ stdcall SetupGetLineTextW(ptr long wstr wstr ptr long ptr) @ stdcall SetupGetMultiSzFieldA(ptr long ptr long ptr) @ stdcall SetupGetMultiSzFieldW(ptr long ptr long ptr) +@ stub SetupGetNonInteractiveMode @ stdcall SetupGetSourceFileLocationA(ptr ptr str ptr ptr long ptr) @ stdcall SetupGetSourceFileLocationW(ptr ptr wstr ptr ptr long ptr) @ stub SetupGetSourceFileSizeA @@ -464,6 +463,8 @@ @ stdcall SetupOpenInfFileW(wstr wstr long ptr) @ stdcall SetupOpenLog(long) @ stdcall SetupOpenMasterInf() +@ stub SetupPrepareQueueForRestoreA +@ stub SetupPrepareQueueForRestoreW @ stdcall SetupPromptForDiskA(ptr str str str str str long ptr long ptr) @ stdcall SetupPromptForDiskW(ptr wstr wstr wstr wstr wstr long ptr long ptr) @ stdcall SetupPromptReboot(ptr ptr long) @@ -509,7 +510,7 @@ @ stub SetupRemoveSectionFromDiskSpaceListW @ stdcall SetupRenameErrorA(long str str str long long) @ stdcall SetupRenameErrorW(long wstr wstr wstr long long) -@ stub SetupScanFileQueue +@ stdcall SetupScanFileQueue(long long long ptr ptr ptr) SetupScanFileQueueA @ stdcall SetupScanFileQueueA(long long long ptr ptr ptr) @ stdcall SetupScanFileQueueW(long long long ptr ptr ptr) @ stdcall SetupSetDirectoryIdA(long long str) @@ -519,49 +520,117 @@ @ stdcall SetupSetFileQueueAlternatePlatformA(ptr ptr str) @ stdcall SetupSetFileQueueAlternatePlatformW(ptr ptr wstr) @ stdcall SetupSetFileQueueFlags(long long long) +@ stub SetupSetNonInteractiveMode @ stub SetupSetPlatformPathOverrideA @ stub SetupSetPlatformPathOverrideW @ stdcall SetupSetSourceListA(long ptr long) @ stdcall SetupSetSourceListW(long ptr long) @ stdcall SetupTermDefaultQueueCallback(ptr) @ stdcall SetupTerminateFileLog(long) -@ stub ShouldDeviceBeExcluded -@ stdcall StampFileSecurity(wstr ptr) -@ stdcall StringTableAddString(ptr wstr long) -@ stdcall StringTableAddStringEx(ptr wstr long ptr long) -@ stdcall StringTableDestroy(ptr) -@ stdcall StringTableDuplicate(ptr) -@ stub StringTableEnum -@ stdcall StringTableGetExtraData(ptr long ptr long) -@ stdcall StringTableInitialize() -@ stdcall StringTableInitializeEx(long long) -@ stdcall StringTableLookUpString(ptr wstr long) -@ stdcall StringTableLookUpStringEx(ptr wstr long ptr ptr) -@ stdcall StringTableSetExtraData(ptr long ptr long) -@ stdcall StringTableStringFromId(ptr long) -@ stdcall StringTableStringFromIdEx(ptr long ptr ptr) -@ stdcall StringTableTrim(ptr) -@ stdcall TakeOwnershipOfFile(wstr) +@ stub SetupUninstallNewlyCopiedInfs +@ stub SetupUninstallOEMInfA +@ stub SetupUninstallOEMInfW +@ stub SetupVerifyInfFileA +@ stub SetupVerifyInfFileW @ stdcall UnicodeToMultiByte(wstr long) -@ stdcall UnmapAndCloseFile(long long ptr) @ stub VerifyCatalogFile -@ stub VerifyFile @ stub pSetupAccessRunOnceNodeList +@ stub pSetupAcquireSCMLock @ stub pSetupAddMiniIconToList @ stub pSetupAddTagToGroupOrderListEntry @ stub pSetupAppendStringToMultiSz +@ stdcall pSetupCaptureAndConvertAnsiArg(str ptr) CaptureAndConvertAnsiArg +@ stdcall pSetupCenterWindowRelativeToParent(long) CenterWindowRelativeToParent +@ stdcall pSetupConcatenatePaths(wstr wstr long ptr) ConcatenatePaths @ stub pSetupDestroyRunOnceNodeList +@ stub pSetupDiGetDeviceInfoContext +@ stub pSetupDiSetDeviceInfoContext +@ stub pSetupDoesUserHavePrivilege +@ stdcall pSetupDuplicateString(wstr) DuplicateString +@ stdcall pSetupEnablePrivilege(wstr long) EnablePrivilege +@ stub pSetupFree +@ stub pSetupFreeStringArray +@ stub pSetupGetCurrentDriverSigningPolicy +@ stdcall pSetupGetField(ptr long) +@ stub pSetupGetFileTitle +@ stdcall pSetupGetGlobalFlags() +@ stub pSetupGetInfSections +@ stdcall pSetupGetQueueFlags(ptr) +@ stub pSetupGetRealSystemTime +@ stdcall pSetupGetVersionInfoFromImage(wstr ptr ptr) GetVersionInfoFromImage +@ stdcall pSetupGuidFromString(wstr ptr) +@ stub pSetupHandleFailedVerification +@ stub pSetupInfCacheBuild +@ stub pSetupInfIsFromOemLocation +@ stub pSetupInstallCatalog +@ stub pSetupInstallStopEx +@ stdcall pSetupIsGuidNull(ptr) +@ stub pSetupIsLocalSystem +@ stub pSetupIsUserAdmin +@ stub pSetupMakeSurePathExists +@ stub pSetupMalloc +@ stub pSetupModifyGlobalFlags +@ stdcall pSetupMultiByteToUnicode(str long) MultiByteToUnicode +@ stdcall pSetupOpenAndMapFileForRead(wstr ptr ptr ptr ptr) OpenAndMapFileForRead +@ stub pSetupOutOfMemory +@ stub pSetupQueryMultiSzValueToArray +@ stub pSetupRealloc +@ stdcall pSetupRegistryDelnode(long long) RegistryDelnode +@ stub pSetupRetrieveServiceConfig +@ stub pSetupSetArrayToMultiSzValue +@ stdcall pSetupSetGlobalFlags(long) +@ stub pSetupSetNoDriverPrompts +@ stdcall pSetupSetQueueFlags(ptr long) +@ stub pSetupSetSystemSourcePath +@ stub pSetupShouldDeviceBeExcluded +@ stdcall pSetupStringFromGuid(ptr wstr long) +@ stdcall pSetupStringTableAddString(ptr wstr long) StringTableAddString +@ stdcall pSetupStringTableAddStringEx(ptr wstr long ptr long) StringTableAddStringEx +@ stdcall pSetupStringTableDestroy(ptr) StringTableDestroy +@ stdcall pSetupStringTableDuplicate(ptr) StringTableDuplicate +@ stub pSetupStringTableEnum +@ stdcall pSetupStringTableGetExtraData(ptr long ptr long) StringTableGetExtraData +@ stdcall pSetupStringTableInitialize() StringTableInitialize +@ stdcall pSetupStringTableInitializeEx(long long) StringTableInitializeEx +@ stdcall pSetupStringTableLookUpString(ptr wstr long) StringTableLookUpString +@ stdcall pSetupStringTableLookUpStringEx(ptr wstr long ptr ptr) StringTableLookUpStringEx +@ stdcall pSetupStringTableSetExtraData(ptr long ptr long) StringTableSetExtraData +@ stdcall pSetupStringTableStringFromId(ptr long) StringTableStringFromId +@ stdcall pSetupStringTableStringFromIdEx(ptr long ptr ptr) StringTableStringFromIdEx +@ stdcall pSetupUnicodeToMultiByte(wstr long) UnicodeToMultiByte +@ stdcall pSetupUnmapAndCloseFile(long long ptr) UnmapAndCloseFile +@ stub pSetupVerifyCatalogFile +@ stub pSetupVerifyFile +@ stub pSetupVerifyQueuedCatalogs +@ stub pSetupWriteLogEntry +@ stub pSetupWriteLogError + +# Unknown functions, they are not present in Win2003 SP1 +@ stdcall AssertFail(str long str) +@ stub CM_Remove_Unmarked_Children +@ stub CM_Remove_Unmarked_Children_Ex +@ stub CM_Reset_Children_Marks +@ stub CM_Reset_Children_Marks_Ex +@ stdcall CaptureStringArg(wstr ptr) +@ stdcall DelayedMove(wstr wstr) +@ stub DelimStringToMultiSz +@ stub DestroyTextFileReadBuffer +@ stdcall FileExists(wstr ptr) +@ stub GetNewInfName +@ stdcall GetSetFileTimestamp(wstr ptr ptr ptr long) +@ stub LookUpStringInTable +@ stub MemoryInitialize +@ stub MultiSzFromSearchControl +@ stdcall MyGetFileTitle(wstr) +@ stdcall QueryRegistryValue(long wstr ptr ptr ptr) +@ stub ReadAsciiOrUnicodeTextFile +# Yes, Microsoft really misspelled this one! +@ stdcall RetreiveFileSecurity(wstr ptr) +@ stub SearchForInfFile +@ stdcall StampFileSecurity(wstr ptr) +@ stdcall StringTableTrim(ptr) +@ stdcall TakeOwnershipOfFile(wstr) @ stub pSetupDirectoryIdToPath -@ stdcall pSetupGetField(ptr long) -@ stdcall pSetupGetGlobalFlags() @ stub pSetupGetOsLoaderDriveAndPath -@ stdcall pSetupGetQueueFlags(ptr) @ stub pSetupGetVersionDatum -@ stdcall pSetupGuidFromString(wstr ptr) -@ stdcall pSetupIsGuidNull(ptr) -@ stub pSetupMakeSurePathExists -@ stdcall pSetupSetGlobalFlags(long) -@ stdcall pSetupSetQueueFlags(ptr long) @ stub pSetupSetSystemSourceFlags -@ stdcall pSetupStringFromGuid(ptr wstr long) -@ stub pSetupVerifyQueuedCatalogs

1 0

[jimtabor] 39707: - Add back removed call commented out. First problem I see with this patch, where is the check for child window? Second, this should be fixed in kernel space not in user32 and separate the kernel function from NtUserCallHwndLock and make a standalone one for win32k. With in this year ROSMENUINFO is going away and is deprecated. New structures will be made available soon.
by jimtabor＠svn.reactos.org 22 Feb '09

22 Feb '09

Author: jimtabor Date: Sun Feb 22 03:32:59 2009 New Revision: 39707 URL: http://svn.reactos.org/svn/reactos?rev=39707&view=rev Log: - Add back removed call commented out. First problem I see with this patch, where is the check for child window? Second, this should be fixed in kernel space not in user32 and separate the kernel function from NtUserCallHwndLock and make a standalone one for win32k. With in this year ROSMENUINFO is going away and is deprecated. New structures will be made available soon. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Feb 22 03:32:59 2009 @@ -4033,6 +4033,7 @@ BOOL WINAPI DrawMenuBar(HWND hWnd) { +// return (BOOL)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_DRAWMENUBAR); ROSMENUINFO MenuInfo; HMENU hMenu; hMenu = GetMenu(hWnd);

1 0

[dreimer] 39706: Our mshtml uses Wine Gecko 0.9.1
by dreimer＠svn.reactos.org 21 Feb '09

21 Feb '09

Author: dreimer Date: Sun Feb 22 02:50:13 2009 New Revision: 39706 URL: http://svn.reactos.org/svn/reactos?rev=39706&view=rev Log: Our mshtml uses Wine Gecko 0.9.1 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Feb 22 02:50:13 2009 @@ -717,5 +717,4 @@ modules\windows\kvmnet.inf 6 optional ; Gecko -modules\windows\wine_gecko-0.9.0.cab 4 optional - +modules\windows\wine_gecko-0.9.1.cab 4 optional

1 0

[mkupfer] 39705: revert hackfix (revision 39704)
by mkupfer＠svn.reactos.org 21 Feb '09

21 Feb '09

Author: mkupfer Date: Sun Feb 22 01:50:49 2009 New Revision: 39705 URL: http://svn.reactos.org/svn/reactos?rev=39705&view=rev Log: revert hackfix (revision 39704) Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Feb 22 01:50:49 2009 @@ -701,7 +701,7 @@ /* Class 5 - Process Information */ QSI_DEF(SystemProcessInformation) { - PSYSTEM_PROCESS_INFORMATION SpiCurrent = NULL; + PSYSTEM_PROCESS_INFORMATION SpiCurrent; PSYSTEM_THREAD_INFORMATION ThreadInfo; PEPROCESS Process = NULL, SystemProcess; PETHREAD CurrentThread; @@ -712,213 +712,176 @@ PLIST_ENTRY CurrentEntry; ULONG TotalSize = 0, ThreadsCount; ULONG TotalUser, TotalKernel; - PUCHAR Current = NULL; + PUCHAR Current; NTSTATUS Status = STATUS_SUCCESS; PUNICODE_STRING ProcessImageName; PWCHAR szSrc; - //1 Write in to bufer - //2 Calc size buffer - //4 Vista compatible - //Flags always start write and calculate size - //For Vista compatible add "| 4" - USHORT OSMode = 1 | 2; - _SEH2_TRY { /* scan the process list */ PSYSTEM_PROCESS_INFORMATION Spi - = (PSYSTEM_PROCESS_INFORMATION) Buffer; - - while ((OSMode & 1) || (OSMode & 2)) + = (PSYSTEM_PROCESS_INFORMATION) Buffer; + + *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); + + if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) { - //Vista first cycle only calc size and readonly - if (OSMode & 4 && OSMode & 1) - OSMode ^= 1; - //not exists byffer or size protect write, only calc size - if (OSMode & 1 && ((Size == 0) || (!Buffer))) - OSMode ^= 1; - - if (OSMode & 1) - { - //Only in second cycle and vista compatible - if (TotalSize > 0 && TotalSize > Size) - { - *ReqSize = TotalSize; - _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } - if (Size > 0) - RtlZeroMemory(Spi, Size); - Current = (PUCHAR) Spi; - SpiCurrent = NULL; - } - - SystemProcess = PsIdleProcess; - Process = SystemProcess; - - do - { - ThreadsCount = 0; - CurrentEntry = Process->ThreadListHead.Flink; - while (CurrentEntry != &Process->ThreadListHead) - { + _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + } + RtlZeroMemory(Spi, Size); + + SystemProcess = PsIdleProcess; + Process = SystemProcess; + Current = (PUCHAR) Spi; + + do + { + SpiCurrent = (PSYSTEM_PROCESS_INFORMATION) Current; + + ThreadsCount = 0; + CurrentEntry = Process->ThreadListHead.Flink; + while (CurrentEntry != &Process->ThreadListHead) + { ThreadsCount++; CurrentEntry = CurrentEntry->Flink; - } - - // size of the structure for every process - CurrentSize = sizeof(SYSTEM_PROCESS_INFORMATION) + sizeof(SYSTEM_THREAD_INFORMATION) * ThreadsCount; - ImageNameLength = 0; - Status = SeLocateProcessImageName(Process, &ProcessImageName); - szSrc = NULL; - if (NT_SUCCESS(Status) && ProcessImageName->Length > 0) + } + + // size of the structure for every process + CurrentSize = sizeof(SYSTEM_PROCESS_INFORMATION) + sizeof(SYSTEM_THREAD_INFORMATION) * ThreadsCount; + ImageNameLength = 0; + Status = SeLocateProcessImageName(Process, &ProcessImageName); + szSrc = NULL; + if (NT_SUCCESS(Status)) + { + szSrc = (PWCHAR)((PCHAR)ProcessImageName->Buffer + ProcessImageName->Length); + /* Loop the file name*/ + while (szSrc > ProcessImageName->Buffer) { - szSrc = (PWCHAR)((PCHAR)ProcessImageName->Buffer + ProcessImageName->Length); - /* Loop the file name*/ - while (szSrc > ProcessImageName->Buffer) + /* Make sure this isn't a backslash */ + if (*--szSrc == OBJ_NAME_PATH_SEPARATOR) { - /* Make sure this isn't a backslash */ - if (*--szSrc == OBJ_NAME_PATH_SEPARATOR) - { szSrc++; break; - } - else - { - ImageNameLength += sizeof(WCHAR); - } - } - } - if (!ImageNameLength && Process != PsIdleProcess && Process->ImageFileName) - { - ImageNameLength = strlen(Process->ImageFileName) * sizeof(WCHAR); - } - - /* Round up the image name length as NT does */ - ImageNameMaximumLength = - (ImageNameLength > 0 ? ROUND_UP(ImageNameLength+1, 8) : 0); - - if (OSMode & 2) - TotalSize += CurrentSize + ImageNameMaximumLength; - - if ((OSMode & 1) && Buffer && TotalSize <= Size) - { - //Set prev structure NextEntryOffset next structure only exists write buffer - if (SpiCurrent && TotalSize <= Size) - SpiCurrent->NextEntryOffset = Current - (PUCHAR)SpiCurrent;// relative offset to the beginnnig of the next structure - SpiCurrent = (PSYSTEM_PROCESS_INFORMATION) Current; - - /* Fill system information */ - SpiCurrent->NumberOfThreads = ThreadsCount; - SpiCurrent->CreateTime = Process->CreateTime; - SpiCurrent->ImageName.Length = ImageNameLength; - SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength; - SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize); - - /* Copy name to the end of the struct */ - if(Process != PsIdleProcess) - { - if (szSrc) - { - RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); - } - else if (Process->ImageFileName) - { - RtlInitAnsiString(&ImageName, Process->ImageFileName); - RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); - } } else { - RtlInitUnicodeString(&SpiCurrent->ImageName, NULL); + ImageNameLength += sizeof(WCHAR); } - - SpiCurrent->BasePriority = Process->Pcb.BasePriority; - SpiCurrent->UniqueProcessId = Process->UniqueProcessId; - SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; - SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); - SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; - SpiCurrent->VirtualSize = Process->VirtualSize; - SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; - SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; - SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize; - SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; - SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0]; - SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; - SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; - SpiCurrent->PagefileUsage = Process->QuotaUsage[2]; - SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2]; - SpiCurrent->PrivatePageCount = Process->CommitCharge; - ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); - - CurrentEntry = Process->ThreadListHead.Flink; - while (CurrentEntry != &Process->ThreadListHead) - { - CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, - ThreadListEntry); - - ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); - ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); - ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart; - ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime; - ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress; - ThreadInfo->ClientId = CurrentThread->Cid; - ThreadInfo->Priority = CurrentThread->Tcb.Priority; - ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority; - ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches; - ThreadInfo->ThreadState = CurrentThread->Tcb.State; - ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason; - - ThreadInfo++; - CurrentEntry = CurrentEntry->Flink; - } - - /* Query total user/kernel times of a process */ - TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser); - SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); - SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); } - /* Release the memory allocated by SeLocateProcessImageName */ - if (NT_SUCCESS(Status)) ExFreePool(ProcessImageName); - - /* Handle idle process entry */ - if (Process == PsIdleProcess) Process = NULL; - - Process = PsGetNextProcess(Process); - ThreadsCount = 0; - if ((Process == SystemProcess) || (Process == NULL)) + } + if (!ImageNameLength && Process != PsIdleProcess && Process->ImageFileName) + { + ImageNameLength = strlen(Process->ImageFileName) * sizeof(WCHAR); + } + + /* Round up the image name length as NT does */ + ImageNameMaximumLength = ROUND_UP(ImageNameLength, 8); + + TotalSize += CurrentSize + ImageNameMaximumLength; + + if (TotalSize > Size) + { + *ReqSize = TotalSize; + ObDereferenceObject(Process); + + /* Release the memory allocated by SeLocateProcessImageName */ + if (NT_SUCCESS(Status)) ExFreePool(ProcessImageName); + + _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + } + + /* Fill system information */ + SpiCurrent->NextEntryOffset = CurrentSize + ImageNameMaximumLength; // relative offset to the beginnnig of the next structure + SpiCurrent->NumberOfThreads = ThreadsCount; + SpiCurrent->CreateTime = Process->CreateTime; + SpiCurrent->ImageName.Length = ImageNameLength; + SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength; + SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize); + + /* Copy name to the end of the struct */ + if(Process != PsIdleProcess) + { + if (szSrc) { + RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); + + /* Release the memory allocated by SeLocateProcessImageName */ + ExFreePool(ProcessImageName); + } + else if (Process->ImageFileName) + { + RtlInitAnsiString(&ImageName, Process->ImageFileName); + RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); + } + } + else + { + RtlInitUnicodeString(&SpiCurrent->ImageName, NULL); + } + + SpiCurrent->BasePriority = Process->Pcb.BasePriority; + SpiCurrent->UniqueProcessId = Process->UniqueProcessId; + SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; + SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); + SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; + SpiCurrent->VirtualSize = Process->VirtualSize; + SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; + SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; + SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize; + SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; + SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0]; + SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; + SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; + SpiCurrent->PagefileUsage = Process->QuotaUsage[2]; + SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2]; + SpiCurrent->PrivatePageCount = Process->CommitCharge; + ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); + + CurrentEntry = Process->ThreadListHead.Flink; + while (CurrentEntry != &Process->ThreadListHead) + { + CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, + ThreadListEntry); + + ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); + ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); + ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart; + ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime; + ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress; + ThreadInfo->ClientId = CurrentThread->Cid; + ThreadInfo->Priority = CurrentThread->Tcb.Priority; + ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority; + ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches; + ThreadInfo->ThreadState = CurrentThread->Tcb.State; + ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason; + + ThreadInfo++; + CurrentEntry = CurrentEntry->Flink; + } + + /* Query total user/kernel times of a process */ + TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser); + SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); + SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); + + /* Handle idle process entry */ + if (Process == PsIdleProcess) Process = NULL; + + Process = PsGetNextProcess(Process); + ThreadsCount = 0; + if ((Process == SystemProcess) || (Process == NULL)) + { + SpiCurrent->NextEntryOffset = 0; break; - } - else - { - if (Current) - Current += CurrentSize + ImageNameMaximumLength; - } + } + else + Current += CurrentSize + ImageNameMaximumLength; } while ((Process != SystemProcess) && (Process != NULL)); - //Break parameters information for only calc size - if ((Size == 0) || (!Buffer)) - break; - //Stop write in to buffer - if (OSMode & 1) - OSMode ^= 1; - //Only first cycle calc size - if (OSMode & 2) - OSMode ^= 2; - //Vista next cycle write in to Buffer - if (OSMode & 4) - { - OSMode |= 1; - OSMode ^= 4; - } - }; - - if(Process != NULL) - ObDereferenceObject(Process); - if ((Size == 0) || (!Buffer) || (TotalSize > Size)) - Status = STATUS_INFO_LENGTH_MISMATCH; - else + + if(Process != NULL) + ObDereferenceObject(Process); Status = STATUS_SUCCESS; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1925,9 +1888,8 @@ if (PreviousMode != KernelMode) { /* SystemKernelDebuggerInformation needs only BOOLEAN alignment */ - if (SystemInformation) - ProbeForWrite(SystemInformation, Length, 1); - if (UnsafeResultLength) + ProbeForWrite(SystemInformation, Length, 1); + if (UnsafeResultLength != NULL) ProbeForWriteUlong(UnsafeResultLength); }

1 0

[mkupfer] 39704: Evgeniy Boltik <bstsoft AT narod DOT ru> Jan Roeloffzen <jroeloffzen AT hotmail DOT com> - Fixes task manager process list names and kernel sysinfo. - See issue #4087 for details.
by mkupfer＠svn.reactos.org 21 Feb '09

21 Feb '09

Author: mkupfer Date: Sun Feb 22 01:41:14 2009 New Revision: 39704 URL: http://svn.reactos.org/svn/reactos?rev=39704&view=rev Log: Evgeniy Boltik <bstsoft AT narod DOT ru> Jan Roeloffzen <jroeloffzen AT hotmail DOT com> - Fixes task manager process list names and kernel sysinfo. - See issue #4087 for details. Modified: trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sun Feb 22 01:41:14 2009 @@ -241,7 +241,8 @@ HeapFree(GetProcessHeap(), 0, pPerfDataOld); } pPerfDataOld = pPerfData; - pPerfData = (PPERFDATA)HeapAlloc(GetProcessHeap(), 0, sizeof(PERFDATA) * ProcessCount); + /* Clear out process perf data structures with HEAP_ZERO_MEMORY flag: */ + pPerfData = (PPERFDATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PERFDATA) * ProcessCount); pSPI = (PSYSTEM_PROCESS_INFORMATION)pBuffer; for (Idx=0; Idx<ProcessCount; Idx++) { /* Get the old perf data for this process (if any) */ @@ -254,14 +255,16 @@ } } - /* Clear out process perf data structure */ - memset(&pPerfData[Idx], 0, sizeof(PERFDATA)); - - if (pSPI->ImageName.Buffer) - wcscpy(pPerfData[Idx].ImageName, pSPI->ImageName.Buffer); - else + if (pSPI->ImageName.Buffer) { + /* Don't assume a UNICODE_STRING Buffer is zero terminated: */ + int len = pSPI->ImageName.Length / 2; + /* Check against max size and allow for terminating zero (already zeroed): */ + if(len >= MAX_PATH)len=MAX_PATH - 1; + wcsncpy(pPerfData[Idx].ImageName, pSPI->ImageName.Buffer, len); + } else { LoadStringW(hInst, IDS_IDLE_PROCESS, pPerfData[Idx].ImageName, sizeof(pPerfData[Idx].ImageName) / sizeof(pPerfData[Idx].ImageName[0])); + } pPerfData[Idx].ProcessId = pSPI->UniqueProcessId; Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Feb 22 01:41:14 2009 @@ -701,7 +701,7 @@ /* Class 5 - Process Information */ QSI_DEF(SystemProcessInformation) { - PSYSTEM_PROCESS_INFORMATION SpiCurrent; + PSYSTEM_PROCESS_INFORMATION SpiCurrent = NULL; PSYSTEM_THREAD_INFORMATION ThreadInfo; PEPROCESS Process = NULL, SystemProcess; PETHREAD CurrentThread; @@ -712,176 +712,213 @@ PLIST_ENTRY CurrentEntry; ULONG TotalSize = 0, ThreadsCount; ULONG TotalUser, TotalKernel; - PUCHAR Current; + PUCHAR Current = NULL; NTSTATUS Status = STATUS_SUCCESS; PUNICODE_STRING ProcessImageName; PWCHAR szSrc; + //1 Write in to bufer + //2 Calc size buffer + //4 Vista compatible + //Flags always start write and calculate size + //For Vista compatible add "| 4" + USHORT OSMode = 1 | 2; + _SEH2_TRY { /* scan the process list */ PSYSTEM_PROCESS_INFORMATION Spi - = (PSYSTEM_PROCESS_INFORMATION) Buffer; - - *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); - - if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) + = (PSYSTEM_PROCESS_INFORMATION) Buffer; + + while ((OSMode & 1) || (OSMode & 2)) { - _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } - RtlZeroMemory(Spi, Size); - - SystemProcess = PsIdleProcess; - Process = SystemProcess; - Current = (PUCHAR) Spi; - - do - { - SpiCurrent = (PSYSTEM_PROCESS_INFORMATION) Current; - - ThreadsCount = 0; - CurrentEntry = Process->ThreadListHead.Flink; - while (CurrentEntry != &Process->ThreadListHead) - { + //Vista first cycle only calc size and readonly + if (OSMode & 4 && OSMode & 1) + OSMode ^= 1; + //not exists byffer or size protect write, only calc size + if (OSMode & 1 && ((Size == 0) || (!Buffer))) + OSMode ^= 1; + + if (OSMode & 1) + { + //Only in second cycle and vista compatible + if (TotalSize > 0 && TotalSize > Size) + { + *ReqSize = TotalSize; + _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + } + if (Size > 0) + RtlZeroMemory(Spi, Size); + Current = (PUCHAR) Spi; + SpiCurrent = NULL; + } + + SystemProcess = PsIdleProcess; + Process = SystemProcess; + + do + { + ThreadsCount = 0; + CurrentEntry = Process->ThreadListHead.Flink; + while (CurrentEntry != &Process->ThreadListHead) + { ThreadsCount++; CurrentEntry = CurrentEntry->Flink; - } - - // size of the structure for every process - CurrentSize = sizeof(SYSTEM_PROCESS_INFORMATION) + sizeof(SYSTEM_THREAD_INFORMATION) * ThreadsCount; - ImageNameLength = 0; - Status = SeLocateProcessImageName(Process, &ProcessImageName); - szSrc = NULL; - if (NT_SUCCESS(Status)) - { - szSrc = (PWCHAR)((PCHAR)ProcessImageName->Buffer + ProcessImageName->Length); - /* Loop the file name*/ - while (szSrc > ProcessImageName->Buffer) + } + + // size of the structure for every process + CurrentSize = sizeof(SYSTEM_PROCESS_INFORMATION) + sizeof(SYSTEM_THREAD_INFORMATION) * ThreadsCount; + ImageNameLength = 0; + Status = SeLocateProcessImageName(Process, &ProcessImageName); + szSrc = NULL; + if (NT_SUCCESS(Status) && ProcessImageName->Length > 0) { - /* Make sure this isn't a backslash */ - if (*--szSrc == OBJ_NAME_PATH_SEPARATOR) + szSrc = (PWCHAR)((PCHAR)ProcessImageName->Buffer + ProcessImageName->Length); + /* Loop the file name*/ + while (szSrc > ProcessImageName->Buffer) { + /* Make sure this isn't a backslash */ + if (*--szSrc == OBJ_NAME_PATH_SEPARATOR) + { szSrc++; break; + } + else + { + ImageNameLength += sizeof(WCHAR); + } + } + } + if (!ImageNameLength && Process != PsIdleProcess && Process->ImageFileName) + { + ImageNameLength = strlen(Process->ImageFileName) * sizeof(WCHAR); + } + + /* Round up the image name length as NT does */ + ImageNameMaximumLength = + (ImageNameLength > 0 ? ROUND_UP(ImageNameLength+1, 8) : 0); + + if (OSMode & 2) + TotalSize += CurrentSize + ImageNameMaximumLength; + + if ((OSMode & 1) && Buffer && TotalSize <= Size) + { + //Set prev structure NextEntryOffset next structure only exists write buffer + if (SpiCurrent && TotalSize <= Size) + SpiCurrent->NextEntryOffset = Current - (PUCHAR)SpiCurrent;// relative offset to the beginnnig of the next structure + SpiCurrent = (PSYSTEM_PROCESS_INFORMATION) Current; + + /* Fill system information */ + SpiCurrent->NumberOfThreads = ThreadsCount; + SpiCurrent->CreateTime = Process->CreateTime; + SpiCurrent->ImageName.Length = ImageNameLength; + SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength; + SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize); + + /* Copy name to the end of the struct */ + if(Process != PsIdleProcess) + { + if (szSrc) + { + RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); + } + else if (Process->ImageFileName) + { + RtlInitAnsiString(&ImageName, Process->ImageFileName); + RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); + } } else { - ImageNameLength += sizeof(WCHAR); + RtlInitUnicodeString(&SpiCurrent->ImageName, NULL); } + + SpiCurrent->BasePriority = Process->Pcb.BasePriority; + SpiCurrent->UniqueProcessId = Process->UniqueProcessId; + SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; + SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); + SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; + SpiCurrent->VirtualSize = Process->VirtualSize; + SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; + SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; + SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize; + SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; + SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0]; + SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; + SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; + SpiCurrent->PagefileUsage = Process->QuotaUsage[2]; + SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2]; + SpiCurrent->PrivatePageCount = Process->CommitCharge; + ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); + + CurrentEntry = Process->ThreadListHead.Flink; + while (CurrentEntry != &Process->ThreadListHead) + { + CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, + ThreadListEntry); + + ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); + ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); + ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart; + ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime; + ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress; + ThreadInfo->ClientId = CurrentThread->Cid; + ThreadInfo->Priority = CurrentThread->Tcb.Priority; + ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority; + ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches; + ThreadInfo->ThreadState = CurrentThread->Tcb.State; + ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason; + + ThreadInfo++; + CurrentEntry = CurrentEntry->Flink; + } + + /* Query total user/kernel times of a process */ + TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser); + SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); + SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); } - } - if (!ImageNameLength && Process != PsIdleProcess && Process->ImageFileName) - { - ImageNameLength = strlen(Process->ImageFileName) * sizeof(WCHAR); - } - - /* Round up the image name length as NT does */ - ImageNameMaximumLength = ROUND_UP(ImageNameLength, 8); - - TotalSize += CurrentSize + ImageNameMaximumLength; - - if (TotalSize > Size) - { - *ReqSize = TotalSize; - ObDereferenceObject(Process); - - /* Release the memory allocated by SeLocateProcessImageName */ - if (NT_SUCCESS(Status)) ExFreePool(ProcessImageName); - - _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } - - /* Fill system information */ - SpiCurrent->NextEntryOffset = CurrentSize + ImageNameMaximumLength; // relative offset to the beginnnig of the next structure - SpiCurrent->NumberOfThreads = ThreadsCount; - SpiCurrent->CreateTime = Process->CreateTime; - SpiCurrent->ImageName.Length = ImageNameLength; - SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength; - SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize); - - /* Copy name to the end of the struct */ - if(Process != PsIdleProcess) - { - if (szSrc) + /* Release the memory allocated by SeLocateProcessImageName */ + if (NT_SUCCESS(Status)) ExFreePool(ProcessImageName); + + /* Handle idle process entry */ + if (Process == PsIdleProcess) Process = NULL; + + Process = PsGetNextProcess(Process); + ThreadsCount = 0; + if ((Process == SystemProcess) || (Process == NULL)) { - RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); - - /* Release the memory allocated by SeLocateProcessImageName */ - ExFreePool(ProcessImageName); + break; } - else if (Process->ImageFileName) + else { - RtlInitAnsiString(&ImageName, Process->ImageFileName); - RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); + if (Current) + Current += CurrentSize + ImageNameMaximumLength; } - } - else - { - RtlInitUnicodeString(&SpiCurrent->ImageName, NULL); - } - - SpiCurrent->BasePriority = Process->Pcb.BasePriority; - SpiCurrent->UniqueProcessId = Process->UniqueProcessId; - SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; - SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); - SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; - SpiCurrent->VirtualSize = Process->VirtualSize; - SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; - SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; - SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize; - SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; - SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0]; - SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; - SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; - SpiCurrent->PagefileUsage = Process->QuotaUsage[2]; - SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2]; - SpiCurrent->PrivatePageCount = Process->CommitCharge; - ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); - - CurrentEntry = Process->ThreadListHead.Flink; - while (CurrentEntry != &Process->ThreadListHead) - { - CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, - ThreadListEntry); - - ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); - ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); - ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart; - ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime; - ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress; - ThreadInfo->ClientId = CurrentThread->Cid; - ThreadInfo->Priority = CurrentThread->Tcb.Priority; - ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority; - ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches; - ThreadInfo->ThreadState = CurrentThread->Tcb.State; - ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason; - - ThreadInfo++; - CurrentEntry = CurrentEntry->Flink; - } - - /* Query total user/kernel times of a process */ - TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser); - SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); - SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); - - /* Handle idle process entry */ - if (Process == PsIdleProcess) Process = NULL; - - Process = PsGetNextProcess(Process); - ThreadsCount = 0; - if ((Process == SystemProcess) || (Process == NULL)) - { - SpiCurrent->NextEntryOffset = 0; - break; - } - else - Current += CurrentSize + ImageNameMaximumLength; } while ((Process != SystemProcess) && (Process != NULL)); - - if(Process != NULL) - ObDereferenceObject(Process); + //Break parameters information for only calc size + if ((Size == 0) || (!Buffer)) + break; + //Stop write in to buffer + if (OSMode & 1) + OSMode ^= 1; + //Only first cycle calc size + if (OSMode & 2) + OSMode ^= 2; + //Vista next cycle write in to Buffer + if (OSMode & 4) + { + OSMode |= 1; + OSMode ^= 4; + } + }; + + if(Process != NULL) + ObDereferenceObject(Process); + if ((Size == 0) || (!Buffer) || (TotalSize > Size)) + Status = STATUS_INFO_LENGTH_MISMATCH; + else Status = STATUS_SUCCESS; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1888,8 +1925,9 @@ if (PreviousMode != KernelMode) { /* SystemKernelDebuggerInformation needs only BOOLEAN alignment */ - ProbeForWrite(SystemInformation, Length, 1); - if (UnsafeResultLength != NULL) + if (SystemInformation) + ProbeForWrite(SystemInformation, Length, 1); + if (UnsafeResultLength) ProbeForWriteUlong(UnsafeResultLength); }

1 0

[mkupfer] 39703: - implements an initial DrawMenuBar function (fixes the taskbar menu redraw bug) - sorry, may contain a potentially hackfix (SendMessage WM_NCPAINT)
by mkupfer＠svn.reactos.org 21 Feb '09

21 Feb '09

Author: mkupfer Date: Sun Feb 22 01:35:11 2009 New Revision: 39703 URL: http://svn.reactos.org/svn/reactos?rev=39703&view=rev Log: - implements an initial DrawMenuBar function (fixes the taskbar menu redraw bug) - sorry, may contain a potentially hackfix (SendMessage WM_NCPAINT) Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Feb 22 01:35:11 2009 @@ -4033,7 +4033,21 @@ BOOL WINAPI DrawMenuBar(HWND hWnd) { - return (BOOL)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_DRAWMENUBAR); + ROSMENUINFO MenuInfo; + HMENU hMenu; + hMenu = GetMenu(hWnd); + if (!hMenu) + return FALSE; + MenuGetRosMenuInfo(&MenuInfo, hMenu); + MenuInfo.Height = 0; // make sure to recalc size + MenuSetRosMenuInfo(&MenuInfo); + /* The wine method doesn't work and I suspect it's more effort + then hackfix solution + SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | + SWP_NOZORDER | SWP_FRAMECHANGED ); + return TRUE;*/ + // FIXME: hackfix + return SendMessage(hWnd,WM_NCPAINT,(WPARAM)1,(LPARAM)0L); }

1 0

[janderwald] 39702: - Fix a bug in KsAllocateDeviceHeader which copied the create item to the wrong offset - Set Created status to true when create function is not zero - Partly implement KsStreamIo - Implement IOCTL for opening / setting state and writing wave data - Clear KSAUDIO_DEVICE_ENTRY - Open the pin in a worker context as IoCreateFile must be called at APC_LEVEL < - Add dispatcher object to sysaudio will dispatch the device requests to the real pin - Add a test application to play a wa
by janderwald＠svn.reactos.org 21 Feb '09

21 Feb '09

Author: janderwald Date: Sat Feb 21 23:18:44 2009 New Revision: 39702 URL: http://svn.reactos.org/svn/reactos?rev=39702&view=rev Log: - Fix a bug in KsAllocateDeviceHeader which copied the create item to the wrong offset - Set Created status to true when create function is not zero - Partly implement KsStreamIo - Implement IOCTL for opening / setting state and writing wave data - Clear KSAUDIO_DEVICE_ENTRY - Open the pin in a worker context as IoCreateFile must be called at APC_LEVEL < - Add dispatcher object to sysaudio will dispatch the device requests to the real pin - Add a test application to play a wav sound - ReactOS can now play a wave tone Added: trunk/reactos/drivers/wdm/audio/backpln/audio_test/ (with props) trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c (with props) trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild (with props) trunk/reactos/drivers/wdm/audio/sysaudio/pin.c (with props) Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/backpln/directory.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -188,7 +188,11 @@ for(Index = 0; Index < ItemsCount; Index++) { /* copy provided create items */ - RtlMoveMemory(&Header->ItemList[Index], &ItemsList[Index], sizeof(KSOBJECT_CREATE_ITEM)); + RtlMoveMemory(&Header->ItemList[Index].CreateItem, &ItemsList[Index], sizeof(KSOBJECT_CREATE_ITEM)); + if (ItemsList[Index].Create!= NULL) + { + Header->ItemList[Index].bCreated = TRUE; + } } Header->MaxItems = ItemsCount; } @@ -716,7 +720,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PIO_STACK_LOCATION IoStack; + //PIO_STACK_LOCATION IoStack; PDEVICE_EXTENSION DeviceExtension; PKSIDEVICE_HEADER DeviceHeader; ULONG Index; @@ -725,7 +729,7 @@ DPRINT1("KS / CREATE\n"); /* get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); + //IoStack = IoGetCurrentIrpStackLocation(Irp); /* get device extension */ DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get device header */ @@ -856,7 +860,7 @@ } else { - DPRINT1("Expected Object Header\n"); + DPRINT1("Expected Object Header %p\n", IoStack->FileObject); KeBugCheckEx(0, 0, 0, 0, 0); return STATUS_SUCCESS; } @@ -1049,9 +1053,11 @@ /* - @unimplemented -*/ -KSDDKAPI NTSTATUS NTAPI + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI KsStreamIo( IN PFILE_OBJECT FileObject, IN PKEVENT Event OPTIONAL, @@ -1065,8 +1071,52 @@ IN ULONG Flags, IN KPROCESSOR_MODE RequestorMode) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + PIRP Irp; + PIO_STACK_LOCATION IoStack; + PDEVICE_OBJECT DeviceObject; + ULONG Code; + NTSTATUS Status; + LARGE_INTEGER Offset; + + if (Flags == KSSTREAM_READ) + Code = IRP_MJ_READ; + else if (Flags == KSSTREAM_WRITE) + Code = IRP_MJ_WRITE; + else + return STATUS_INVALID_PARAMETER; + + DeviceObject = IoGetRelatedDeviceObject(FileObject); + if (!DeviceObject) + return STATUS_INVALID_PARAMETER; + + if (Event) + { + KeResetEvent(Event); + } + + Offset.QuadPart = 0LL; + Irp = IoBuildSynchronousFsdRequest(Code, DeviceObject, (PVOID)StreamHeaders, Length, &Offset, Event, IoStatusBlock); + if (!Irp) + { + return STATUS_UNSUCCESSFUL; + } + + + if (CompletionRoutine) + { + IoSetCompletionRoutine(Irp, + CompletionRoutine, + CompletionContext, + (CompletionInvocationFlags & KsInvokeOnSuccess), + (CompletionInvocationFlags & KsInvokeOnError), + (CompletionInvocationFlags & KsInvokeOnCancel)); + } + + IoStack = IoGetNextIrpStackLocation(Irp); + IoStack->FileObject = FileObject; + + Status = IoCallDriver(DeviceObject, Irp); + return Status; } /* Propchange: trunk/reactos/drivers/wdm/audio/backpln/audio_test/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 21 23:18:44 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/wdm/audio/backpln/audio_test/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/wdm/audio/backpln/audio_test/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/wdm/audio/backpln/audio_test/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -1,0 +1,152 @@ +#define _UNICODE +#define UNICODE +#include <windows.h> +#include <mmsystem.h> +#include <stdio.h> +#include <math.h> + +#define _2pi 6.283185307179586476925286766559 + +#include <ks.h> +#include <ksmedia.h> +#include "interface.h" + +int +__cdecl +main(int argc, char* argv[]) +{ + ULONG Length; + PSHORT SoundBuffer; + ULONG i = 0; + BOOL Status; + OVERLAPPED Overlapped; + DWORD BytesReturned; + HANDLE hWdmAud; + WDMAUD_DEVICE_INFO DeviceInfo; + + + hWdmAud = CreateFileW(L"\\\\.\\wdmaud", + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + if (!hWdmAud) + { + printf("Failed to open wdmaud with %lx\n", GetLastError()); + return -1; + } + + printf("WDMAUD: opened\n"); + /* clear device info */ + RtlZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + + ZeroMemory(&Overlapped, sizeof(OVERLAPPED)); + Overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + DeviceInfo.DeviceType = WAVE_OUT_DEVICE_TYPE; + + Status = DeviceIoControl(hWdmAud, IOCTL_GETNUMDEVS_TYPE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); + + if (!Status) + { + if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) + { + printf("Failed to get num of wave out devices with %lx\n", GetLastError()); + CloseHandle(hWdmAud); + return -1; + } + } + + printf("WDMAUD: Num Devices %lu\n", DeviceInfo.DeviceCount); + if (!DeviceInfo.DeviceCount) + { + CloseHandle(hWdmAud); + return 0; + } + + DeviceInfo.u.WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); + DeviceInfo.u.WaveFormatEx.wFormatTag = 0x1; //WAVE_FORMAT_PCM; + DeviceInfo.u.WaveFormatEx.nChannels = 2; + DeviceInfo.u.WaveFormatEx.nSamplesPerSec = 48000; + DeviceInfo.u.WaveFormatEx.nBlockAlign = 4; + DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = 48000 * 4; + DeviceInfo.u.WaveFormatEx.wBitsPerSample = 16; + + + + Status = DeviceIoControl(hWdmAud, IOCTL_OPEN_WDMAUD, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); + if (!Status) + { + if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) + { + printf("Failed to open device with %lx\n", GetLastError()); + CloseHandle(hWdmAud); + return -1; + } + } + + // + // Allocate a buffer for 1 second + // + Length = 48000 * 4; + SoundBuffer = (PSHORT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length); + + // + // Fill the buffer with a 500 Hz sine tone + // + while (i < Length / 2) + { + // + // Generate the wave for each channel: + // Amplitude * sin( Sample * Frequency * 2PI / SamplesPerSecond ) + // + SoundBuffer[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * _2pi / 48000); + i++; + SoundBuffer[i] = 0x7FFF * sin((0.5 * i - 2) * 500 * _2pi / 48000); + i++; + } + + DeviceInfo.State = KSSTATE_RUN; + Status = DeviceIoControl(hWdmAud, IOCTL_SETDEVICE_STATE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); + if (!Status) + { + if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) + { + printf("Failed to set device into run state %lx\n", GetLastError()); + CloseHandle(hWdmAud); + return -1; + } + } + + // + // Play our 1-second buffer + // + DeviceInfo.Buffer = (PUCHAR)SoundBuffer; + DeviceInfo.BufferSize = Length; + Status = DeviceIoControl(hWdmAud, IOCTL_WRITEDATA, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); + if (!Status) + { + if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) + { + printf("Failed to play buffer %lx\n", GetLastError()); + CloseHandle(hWdmAud); + return -1; + } + } + + DeviceInfo.State = KSSTATE_STOP; + Status = DeviceIoControl(hWdmAud, IOCTL_SETDEVICE_STATE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); + if (!Status) + { + if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) + { + printf("Failed to set device into stop state %lx\n", GetLastError()); + CloseHandle(hWdmAud); + return -1; + } + } + CloseHandle(hWdmAud); + return 0; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild (added) +++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> +<module name="audio_test" type="win32cui" installbase="system32" installname="audio_test.exe"> + <define name="PC_NO_IMPORTS" /> + <include base="ReactOS">include/reactos/libs/sound</include> + <include base="wdmaud_kernel">.</include> + <library>kernel32</library> + + <file>audio_test.c</file> + +</module> Propchange: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="audio_test"> + <xi:include href="audio_test/audio_test.rbuild" /> + </directory> <directory name="portcls"> <xi:include href="portcls/portcls.rbuild" /> </directory> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -350,7 +350,7 @@ { PKSPROPERTY Property; NTSTATUS Status; - UNICODE_STRING GuidString, GuidString2; + UNICODE_STRING GuidString; PIO_STACK_LOCATION IoStack; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; @@ -413,6 +413,7 @@ This->State = *State; Irp->IoStatus.Information = sizeof(KSSTATE); Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } Irp->IoStatus.Status = Status; @@ -484,11 +485,9 @@ } RtlStringFromGUID(&Property->Set, &GuidString); - RtlStringFromGUID(&KSPROPSETID_Connection, &GuidString2); - DPRINT1("Unhandeled property Set |%S| |%S|Id %u Flags %x\n", GuidString.Buffer, GuidString2.Buffer, Property->Id, Property->Flags); + DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); DbgBreakPoint(); RtlFreeUnicodeString(&GuidString); - RtlFreeUnicodeString(&GuidString2); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -8,6 +8,322 @@ */ #include "wdmaud.h" +const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSPROPSETID_Sysaudio = {0xCBE3FAA0L, 0xCC75, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6}}; +const GUID KSPROPSETID_General = {0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSINTERFACESETID_Standard = {0x1A8766A0L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; + + +NTSTATUS +SetIrpIoStatus( + IN PIRP Irp, + IN NTSTATUS Status, + IN ULONG Length) +{ + Irp->IoStatus.Information = Length; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + +} + +NTSTATUS +WdmAudControlOpen( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo) +{ + PSYSAUDIO_INSTANCE_INFO InstanceInfo; + ULONG BytesReturned; + NTSTATUS Status; + ACCESS_MASK DesiredAccess = 0; + HANDLE PinHandle; + KSPIN_CONNECT * PinConnect; + KSDATAFORMAT_WAVEFORMATEX * DataFormat; + + if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE) + { + DPRINT1("FIXME: only waveout devices are supported\n"); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + InstanceInfo = ExAllocatePool(NonPagedPool, sizeof(KSDATAFORMAT_WAVEFORMATEX) + sizeof(KSPIN_CONNECT)); + if (!InstanceInfo) + { + /* no memory */ + return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); + } + + InstanceInfo->Property.Set = KSPROPSETID_Sysaudio; + InstanceInfo->Property.Id = KSPROPERTY_SYSAUDIO_INSTANCE_INFO; + InstanceInfo->Property.Flags = KSPROPERTY_TYPE_SET; + InstanceInfo->Flags = 0; + InstanceInfo->DeviceNumber = DeviceInfo->DeviceIndex; + + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)InstanceInfo, sizeof(SYSAUDIO_INSTANCE_INFO), NULL, 0, &BytesReturned); + + if (!NT_SUCCESS(Status)) + { + /* failed to acquire audio device */ + DPRINT1("KsSynchronousIoControlDevice failed with %x\n", Status); + ExFreePool(InstanceInfo); + return SetIrpIoStatus(Irp, Status, 0); + } + + if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE || + DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE || + DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) + { + DesiredAccess |= GENERIC_READ; + } + + if (DeviceInfo->DeviceType == WAVE_OUT_DEVICE_TYPE || + DeviceInfo->DeviceType == MIDI_OUT_DEVICE_TYPE || + DeviceInfo->DeviceType == AUX_DEVICE_TYPE || + DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) + { + DesiredAccess |= GENERIC_WRITE; + } + + PinConnect = (KSPIN_CONNECT*)InstanceInfo; + + + PinConnect->Interface.Set = KSINTERFACESETID_Standard; + PinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING; + PinConnect->Interface.Flags = 0; + PinConnect->Medium.Set = KSMEDIUMSETID_Standard; + PinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE; + PinConnect->Medium.Flags = 0; + PinConnect->PinId = 0; //FIXME + PinConnect->PinToHandle = NULL; + PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; + PinConnect->Priority.PrioritySubClass = 1; + + + DataFormat = (KSDATAFORMAT_WAVEFORMATEX*) (PinConnect + 1); + DataFormat->WaveFormatEx.wFormatTag = DeviceInfo->u.WaveFormatEx.wFormatTag; + DataFormat->WaveFormatEx.nChannels = DeviceInfo->u.WaveFormatEx.nChannels; + DataFormat->WaveFormatEx.nSamplesPerSec = DeviceInfo->u.WaveFormatEx.nSamplesPerSec; + DataFormat->WaveFormatEx.nBlockAlign = DeviceInfo->u.WaveFormatEx.nBlockAlign; + DataFormat->WaveFormatEx.nAvgBytesPerSec = DeviceInfo->u.WaveFormatEx.nAvgBytesPerSec; + DataFormat->WaveFormatEx.wBitsPerSample = DeviceInfo->u.WaveFormatEx.wBitsPerSample; + DataFormat->WaveFormatEx.cbSize = 0; + DataFormat->DataFormat.FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEX); + DataFormat->DataFormat.Flags = 0; + DataFormat->DataFormat.Reserved = 0; + DataFormat->DataFormat.MajorFormat = KSDATAFORMAT_TYPE_AUDIO; + + if (DeviceInfo->u.WaveFormatEx.wFormatTag != WAVE_FORMAT_PCM) + DPRINT1("FIXME\n"); + + DataFormat->DataFormat.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + DataFormat->DataFormat.Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; + DataFormat->DataFormat.SampleSize = 4; + + + Status = KsCreatePin(ClientInfo->hSysAudio, PinConnect, DesiredAccess, &PinHandle); + DPRINT1("KsCreatePin Status %x\n", Status); + + + /* free buffer */ + ExFreePool(InstanceInfo); + + if (NT_SUCCESS(Status)) + { + DeviceInfo->hDevice = PinHandle; + } + else + { + DeviceInfo->hDevice = NULL; + } + + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); +} + +NTSTATUS +WdmAudControlDeviceType( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo) +{ + KSPROPERTY Property; + ULONG Result, BytesReturned; + NTSTATUS Status; + + if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE) + { + DPRINT1("FIXME: only waveout devices are supported\n"); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + Property.Set = KSPROPSETID_Sysaudio; + Property.Id = KSPROPERTY_SYSAUDIO_DEVICE_COUNT; + Property.Flags = KSPROPERTY_TYPE_GET; + + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)&Result, sizeof(ULONG), &BytesReturned); + + if (NT_SUCCESS(Status)) + DeviceInfo->DeviceCount = Result; + else + DeviceInfo->DeviceCount = 0; + + DPRINT1("WdmAudControlDeviceType Status %x Devices %u\n", Status, DeviceInfo->DeviceCount); + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); +} + +NTSTATUS +WdmAudControlDeviceState( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo) +{ + KSPROPERTY Property; + KSSTATE State; + NTSTATUS Status; + ULONG BytesReturned; + PFILE_OBJECT FileObject; + + if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE) + { + DPRINT1("FIXME: only waveout devices are supported\n"); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: invalid device handle provided %p\n", DeviceInfo->hDevice); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + Property.Set = KSPROPSETID_Connection; + Property.Id = KSPROPERTY_CONNECTION_STATE; + Property.Flags = KSPROPERTY_TYPE_SET; + + State = DeviceInfo->State; + + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)&State, sizeof(KSSTATE), &BytesReturned); + + ObDereferenceObject(FileObject); + + DPRINT1("WdmAudControlDeviceState Status %x\n", Status); + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); +} + +NTSTATUS +NTAPI +WdmAudWriteCompleted( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Ctx) +{ + PWRITE_CONTEXT Context = (PWRITE_CONTEXT)Ctx; + + Context->Irp->IoStatus.Information = Context->Length; + Context->Irp->IoStatus.Status = Irp->IoStatus.Status; + IoCompleteRequest(Context->Irp, IO_SOUND_INCREMENT); + + ExFreePool(Context); + return STATUS_SUCCESS; +} + +NTSTATUS +WdmAudControlWriteData( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo) +{ + PKSSTREAM_HEADER Packet; + NTSTATUS Status = STATUS_SUCCESS; + PFILE_OBJECT FileObject; + PWRITE_CONTEXT Context; + ULONG BytesReturned; + PUCHAR Buffer; + + Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid buffer handle %x\n", DeviceInfo->hDevice); + return SetIrpIoStatus(Irp, Status, 0); + } + + if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE) + { + DPRINT1("FIXME: only waveout devices are supported\n"); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + _SEH2_TRY + { + ProbeForRead(DeviceInfo->Buffer, DeviceInfo->BufferSize, TYPE_ALIGNMENT(char)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid buffer supplied\n"); + return SetIrpIoStatus(Irp, Status, 0); + } + + Buffer = ExAllocatePool(NonPagedPool, DeviceInfo->BufferSize); + if (!Buffer) + { + /* no memory */ + return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); + } + + RtlMoveMemory(Buffer, DeviceInfo->Buffer, DeviceInfo->BufferSize); + + + Context = ExAllocatePool(NonPagedPool, sizeof(WRITE_CONTEXT)); + if (!Context) + { + /* no memory */ + return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); + } + + /* setup completion context */ + Context->Irp = Irp; + Context->Length = DeviceInfo->BufferSize; + + /* setup stream context */ + Packet = (PKSSTREAM_HEADER)ExAllocatePool(NonPagedPool, sizeof(KSSTREAM_HEADER)); + Packet->Data = Buffer; + Packet->FrameExtent = DeviceInfo->BufferSize; + Packet->DataUsed = DeviceInfo->BufferSize; + Packet->Size = sizeof(KSSTREAM_HEADER); + Packet->PresentationTime.Numerator = 1; + Packet->PresentationTime.Denominator = 1; + ASSERT(FileObject->FsContext != NULL); + + + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, (PVOID)Packet, sizeof(KSSTREAM_HEADER), NULL, 0, &BytesReturned); + + DPRINT1("KsSynchronousIoControlDevice result %x\n", Status); + + IoMarkIrpPending(Irp); + Irp->IoStatus.Information = DeviceInfo->BufferSize; + Irp->IoStatus.Status = Status; + + ExFreePool(Buffer); + + return Status; +} + + NTSTATUS NTAPI @@ -16,42 +332,59 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; + PWDMAUD_DEVICE_INFO DeviceInfo; + PWDMAUD_CLIENT ClientInfo; IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("WdmAudDeviceControl entered\n"); + DbgBreakPoint(); + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(WDMAUD_DEVICE_INFO)) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } + /* invalid parameter */ + DPRINT1("Input buffer too small size %u expected %u\n", IoStack->Parameters.DeviceIoControl.InputBufferLength, sizeof(WDMAUD_DEVICE_INFO)); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + DeviceInfo = (PWDMAUD_DEVICE_INFO)Irp->AssociatedIrp.SystemBuffer; + + if (DeviceInfo->DeviceType < MIN_SOUND_DEVICE_TYPE || DeviceInfo->DeviceType > MAX_SOUND_DEVICE_TYPE) + { + /* invalid parameter */ + DPRINT1("Error: device type not set\n"); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + if (!IoStack->FileObject) + { + /* file object parameter */ + DPRINT1("Error: file object is not attached\n"); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + ClientInfo = (PWDMAUD_CLIENT)IoStack->FileObject->FsContext; DPRINT1("WdmAudDeviceControl entered\n"); switch(IoStack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_OPEN_WDMAUD: - //return WdmAudDeviceControlOpen(DeviceObject, Irp); + return WdmAudControlOpen(DeviceObject, Irp, DeviceInfo, ClientInfo); + case IOCTL_GETNUMDEVS_TYPE: + return WdmAudControlDeviceType(DeviceObject, Irp, DeviceInfo, ClientInfo); + case IOCTL_SETDEVICE_STATE: + return WdmAudControlDeviceState(DeviceObject, Irp, DeviceInfo, ClientInfo); + case IOCTL_WRITEDATA: + return WdmAudControlWriteData(DeviceObject, Irp, DeviceInfo, ClientInfo); + case IOCTL_CLOSE_WDMAUD: - case IOCTL_GETNUMDEVS_TYPE: - case IOCTL_SETDEVICE_STATE: case IOCTL_GETDEVID: case IOCTL_GETVOLUME: case IOCTL_SETVOLUME: case IOCTL_GETCAPABILITIES: - case IOCTL_WRITEDATA: + DPRINT1("Unhandeled %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); break; } - - - - UNIMPLEMENTED - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; -} + return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); +} Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -120,7 +120,7 @@ NTSTATUS Status; PIO_STACK_LOCATION IoStack; - WDMAUD_CLIENT *pClient; + PWDMAUD_CLIENT pClient; PWDMAUD_DEVICE_EXTENSION DeviceExtension; @@ -189,11 +189,11 @@ pClient = (WDMAUD_CLIENT*)IoStack->FileObject->FsContext; if (pClient) { + ObDereferenceObject(pClient->FileObject); ZwClose(pClient->hSysAudio); ExFreePool(pClient); IoStack->FileObject->FsContext = NULL; } - Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -44,7 +44,7 @@ WAVEINCAPS WaveInCaps; }u; -}WDMAUD_DEVICE_INFO; +}WDMAUD_DEVICE_INFO, *PWDMAUD_DEVICE_INFO; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -1,6 +1,7 @@ #ifndef WDMAUD_H__ #define WDMAUD_H__ +#include <pseh/pseh2.h> #include <ntddk.h> #include <portcls.h> #include <ks.h> @@ -86,6 +87,14 @@ }WDMAUD_DEVICE_EXTENSION, *PWDMAUD_DEVICE_EXTENSION; +typedef struct +{ + PIRP Irp; + IO_STATUS_BLOCK StatusBlock; + ULONG Length; +}WRITE_CONTEXT, *PWRITE_CONTEXT; + + NTSTATUS WdmAudRegisterDeviceInterface( IN PDEVICE_OBJECT PhysicalDeviceObject, Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -6,6 +6,7 @@ <include base="ReactOS">include/reactos/libs/sound</include> <library>ntoskrnl</library> <library>ks</library> + <library>pseh</library> <file>control.c</file> <file>deviface.c</file> <file>entry.c</file> Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -29,6 +29,7 @@ { Irp->IoStatus.Information = Length; Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -242,7 +243,7 @@ } else if (Property->Id == KSPROPERTY_SYSAUDIO_INSTANCE_INFO) { - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(SYSAUDIO_INSTANCE_INFO)) + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(SYSAUDIO_INSTANCE_INFO)) { /* too small buffer */ return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(SYSAUDIO_INSTANCE_INFO)); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -52,6 +52,8 @@ DPRINT1("No Mem\n"); return STATUS_INSUFFICIENT_RESOURCES; } + + RtlZeroMemory(DeviceEntry, sizeof(KSAUDIO_DEVICE_ENTRY)); DeviceEntry->DeviceName.Length = 0; DeviceEntry->DeviceName.MaximumLength = Event->SymbolicLinkName->Length + 5 * sizeof(WCHAR); DeviceEntry->DeviceName.Buffer = ExAllocatePool(NonPagedPool, DeviceEntry->DeviceName.MaximumLength); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -175,6 +175,61 @@ Dispatch_fnFastWrite, }; +VOID +NTAPI +CreatePinWorkerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + NTSTATUS Status; + HANDLE PinHandle; + HANDLE * Handels; + PFILE_OBJECT FileObject; + PIRP Irp; + PPIN_WORKER_CONTEXT WorkerContext = (PPIN_WORKER_CONTEXT)Context; + + Handels = ExAllocatePool(NonPagedPool, (WorkerContext->Entry->NumberOfPins + 1) * sizeof(HANDLE)); + if (!Handels) + { + DPRINT1("No Memory \n"); + WorkerContext->Irp->IoStatus.Status = STATUS_NO_MEMORY; + WorkerContext->Irp->IoStatus.Information = 0; + IoCompleteRequest(WorkerContext->Irp, IO_SOUND_INCREMENT); + return; + } + + + Status = KsCreatePin(WorkerContext->Entry->Handle, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &PinHandle); + DPRINT1("KsCreatePin status %x\n", Status); + + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(PinHandle, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (NT_SUCCESS(Status)) + { + Status = CreateDispatcher(WorkerContext->Irp, PinHandle, FileObject); + DPRINT1("Pins %x\n", WorkerContext->Entry->NumberOfPins); + if (WorkerContext->Entry->NumberOfPins) + { + RtlMoveMemory(Handels, WorkerContext->Entry->Pins, WorkerContext->Entry->NumberOfPins * sizeof(HANDLE)); + ExFreePool(WorkerContext->Entry->Pins); + } + Handels[WorkerContext->Entry->NumberOfPins-1] = PinHandle; + WorkerContext->Entry->Pins = Handels; + WorkerContext->Entry->NumberOfPins++; + } + } + + DPRINT1("CreatePinWorkerRoutine completing irp\n"); + WorkerContext->Irp->IoStatus.Status = Status; + WorkerContext->Irp->IoStatus.Information = 0; + + Irp = WorkerContext->Irp; + ExFreePool(Context); + + IoCompleteRequest(Irp, IO_SOUND_INCREMENT); +} + NTSTATUS NTAPI DispatchCreateSysAudio( @@ -185,9 +240,79 @@ KSOBJECT_HEADER ObjectHeader; PSYSAUDIO_CLIENT Client; PKSOBJECT_CREATE_ITEM CreateItem; + PIO_STACK_LOCATION IoStatus; + LPWSTR Buffer; + ULONG Length, DeviceIndex; + PSYSAUDIODEVEXT DeviceExtension; + PKSAUDIO_DEVICE_ENTRY Entry; + KSPIN_CONNECT * PinConnect; + PIO_WORKITEM WorkItem; + PPIN_WORKER_CONTEXT Context; + static LPWSTR KS_NAME_PIN = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"; + + IoStatus = IoGetCurrentIrpStackLocation(Irp); + Buffer = IoStatus->FileObject->FileName.Buffer; DPRINT1("DispatchCreateSysAudio entered\n"); - DbgBreakPoint(); + + if (Buffer) + { + /* is the request for a new pin */ + if (!wcsncmp(KS_NAME_PIN, Buffer, wcslen(KS_NAME_PIN))) + { + Client = (PSYSAUDIO_CLIENT)Irp->Tail.Overlay.OriginalFileObject->FsContext2; + DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; + if (Client) + { + ASSERT(Client->NumDevices >= 1); + DeviceIndex = Client->Devices[Client->NumDevices-1]; + } + else + { + DPRINT1("Warning: using HACK\n"); + DeviceIndex = 0; + } + ASSERT(DeviceIndex < DeviceExtension->NumberOfKsAudioDevices); + Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, DeviceIndex); + ASSERT(Entry); + + Length = (IoStatus->FileObject->FileName.Length - ((wcslen(KS_NAME_PIN)+1) * sizeof(WCHAR))); + PinConnect = ExAllocatePool(NonPagedPool, Length); + if (!PinConnect) + { + Irp->IoStatus.Status = STATUS_NO_MEMORY; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NO_MEMORY; + } + RtlMoveMemory(PinConnect, IoStatus->FileObject->FileName.Buffer + (wcslen(KS_NAME_PIN)+1), Length); + Context = ExAllocatePool(NonPagedPool, sizeof(PIN_WORKER_CONTEXT)); + if (!Context) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + Context->PinConnect = PinConnect; + Context->Entry = Entry; + Context->Irp = Irp; + + WorkItem = IoAllocateWorkItem(DeviceObject); + if (!WorkItem) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + IoQueueWorkItem(WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + return STATUS_PENDING; + } + } /* allocate create item */ CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); @@ -209,6 +334,9 @@ /* store create context */ CreateItem->Context = (PVOID)Client; + /* store the object in FsContext */ + IoStatus->FileObject->FsContext2 = (PVOID)Client; + /* allocate object header */ Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); @@ -228,8 +356,6 @@ if (!CreateItem) return STATUS_INSUFFICIENT_RESOURCES; - - /* initialize create item struct */ RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); CreateItem->Create = DispatchCreateSysAudio; @@ -238,7 +364,6 @@ Status = KsAllocateDeviceHeader(&DeviceExtension->KsDeviceHeader, 1, CreateItem); - return Status; } Added: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c (added) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -1,0 +1,261 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/sysaudio/deviface.c + * PURPOSE: System Audio graph builder + * PROGRAMMER: Johannes Anderwald + */ + +#include <ntifs.h> +#include <ntddk.h> +#include <portcls.h> +#include <ks.h> +#include <ksmedia.h> +#include <math.h> +#define YDEBUG +#include <debug.h> +#include "sysaudio.h" + +NTSTATUS +NTAPI +Pin_fnDeviceIoControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PDISPATCH_CONTEXT Context; + PKSOBJECT_CREATE_ITEM CreateItem; + NTSTATUS Status; + ULONG BytesReturned; + PIO_STACK_LOCATION IoStack; + + DPRINT1("Pin_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + Context = (PDISPATCH_CONTEXT)CreateItem->Context; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + Status = KsSynchronousIoControlDevice(Context->FileObject, KernelMode, IoStack->Parameters.DeviceIoControl.IoControlCode, + IoStack->Parameters.DeviceIoControl.Type3InputBuffer, + IoStack->Parameters.DeviceIoControl.InputBufferLength, + Irp->UserBuffer, + IoStack->Parameters.DeviceIoControl.OutputBufferLength, + &BytesReturned); + + DPRINT1("Status %x\n", Status); + + Irp->IoStatus.Information = BytesReturned; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +Pin_fnRead( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnRead called DeviceObject %p Irp %p\n", DeviceObject); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PinWriteCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PIRP CIrp = (PIRP)Context; + + CIrp->IoStatus.Status = STATUS_SUCCESS; + CIrp->IoStatus.Information = 0; + IoCompleteRequest(CIrp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnWrite( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PDISPATCH_CONTEXT Context; + PKSOBJECT_CREATE_ITEM CreateItem; + PIO_STACK_LOCATION IoStack; + ULONG BytesReturned; + NTSTATUS Status; + + DPRINT1("Pin_fnWrite called DeviceObject %p Irp %p\n", DeviceObject); + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + Context = (PDISPATCH_CONTEXT)CreateItem->Context; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + Status = KsSynchronousIoControlDevice(Context->FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, + IoStack->Parameters.DeviceIoControl.Type3InputBuffer, + IoStack->Parameters.DeviceIoControl.InputBufferLength, + Irp->UserBuffer, + IoStack->Parameters.DeviceIoControl.OutputBufferLength, + &BytesReturned); + + Irp->IoStatus.Information = BytesReturned; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +Pin_fnFlush( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnFlush called DeviceObject %p Irp %p\n", DeviceObject); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnClose( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnQuerySecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); + + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnSetSecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + + DPRINT1("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); + + return STATUS_SUCCESS; +} + +BOOLEAN +NTAPI +Pin_fnFastDeviceIoControl( + PFILE_OBJECT FileObject, + BOOLEAN Wait, + PVOID InputBuffer, + ULONG InputBufferLength, + PVOID OutputBuffer, + ULONG OutputBufferLength, + ULONG IoControlCode, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Pin_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + + + return FALSE; +} + + +BOOLEAN +NTAPI +Pin_fnFastRead( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Pin_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); + + return FALSE; + +} + +BOOLEAN +NTAPI +Pin_fnFastWrite( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + + return FALSE; +} + +static KSDISPATCH_TABLE PinTable = +{ + Pin_fnDeviceIoControl, + Pin_fnRead, + Pin_fnWrite, + Pin_fnFlush, + Pin_fnClose, + Pin_fnQuerySecurity, + Pin_fnSetSecurity, + Pin_fnFastDeviceIoControl, + Pin_fnFastRead, + Pin_fnFastWrite, +}; + +NTSTATUS +CreateDispatcher( + IN PIRP Irp, + IN HANDLE Handle, + IN PFILE_OBJECT FileObject) +{ + PKSOBJECT_CREATE_ITEM CreateItem; + NTSTATUS Status; + KSOBJECT_HEADER ObjectHeader; + PDISPATCH_CONTEXT Context; + + /* allocate create item */ + CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + if (!CreateItem) + return STATUS_INSUFFICIENT_RESOURCES; + + Context = ExAllocatePool(NonPagedPool, sizeof(DISPATCH_CONTEXT)); + if (!Context) + { + ExFreePool(CreateItem); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Context->Handle = Handle; + Context->FileObject = FileObject; + + + CreateItem->Context = (PVOID)Context; + + /* allocate object header */ + Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &PinTable); + return Status; +} Propchange: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -15,16 +15,19 @@ HANDLE Handle; PFILE_OBJECT FileObject; UNICODE_STRING DeviceName; + ULONG NumberOfClients; - ULONG NumberOfClients; + ULONG NumberOfPins; + HANDLE * Pins; + }KSAUDIO_DEVICE_ENTRY, *PKSAUDIO_DEVICE_ENTRY; typedef struct { + KSDEVICE_HEADER KsDeviceHeader; PDEVICE_OBJECT PhysicalDeviceObject; PDEVICE_OBJECT NextDeviceObject; - KSDEVICE_HEADER KsDeviceHeader; ULONG NumberOfKsAudioDevices; LIST_ENTRY KsAudioDeviceList; @@ -32,6 +35,20 @@ PVOID EchoCancelNotificationEntry; KMUTEX Mutex; }SYSAUDIODEVEXT, *PSYSAUDIODEVEXT; + +typedef struct +{ + PIRP Irp; + PKSAUDIO_DEVICE_ENTRY Entry; + KSPIN_CONNECT * PinConnect; + +}PIN_WORKER_CONTEXT, *PPIN_WORKER_CONTEXT; + +typedef struct +{ + HANDLE Handle; + PFILE_OBJECT FileObject; +}DISPATCH_CONTEXT, *PDISPATCH_CONTEXT; NTSTATUS SysAudioAllocateDeviceHeader( @@ -51,4 +68,15 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp); +PKSAUDIO_DEVICE_ENTRY +GetListEntry( + IN PLIST_ENTRY Head, + IN ULONG Index); + +NTSTATUS +CreateDispatcher( + IN PIRP Irp, + IN HANDLE Handle, + IN PFILE_OBJECT FileObject); + #endif Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild [iso-8859-1] Sat Feb 21 23:18:44 2009 @@ -4,11 +4,13 @@ <include base="sysaudio">.</include> <library>ntoskrnl</library> <library>ks</library> + <library>hal</library> <library>libcntpr</library> <define name="_COMDDK_" /> <file>control.c</file> <file>deviface.c</file> <file>dispatcher.c</file> <file>main.c</file> + <file>pin.c</file> <file>sysaudio.rc</file> </module>

1 0

[janderwald] 39701: - Add macros for KsStreamIo
by janderwald＠svn.reactos.org 21 Feb '09

21 Feb '09

Author: janderwald Date: Sat Feb 21 23:10:21 2009 New Revision: 39701 URL: http://svn.reactos.org/svn/reactos?rev=39701&view=rev Log: - Add macros for KsStreamIo Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3970… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat Feb 21 23:10:21 2009 @@ -52,8 +52,10 @@ #define KSDATAFORMAT_BIT_ATTRIBUTES 1 #define KSDATAFORMAT_ATTRIBUTES (1 << KSDATAFORMAT_BIT_ATTRIBUTES) + +#if defined(_NTDDK_) typedef PVOID PKSWORKER; - +#endif /* =============================================================== GUID definition helpers */ @@ -2355,6 +2357,23 @@ Event Functions */ #if defined(_NTDDK_) + +#define KSPROBE_STREAMREAD 0x00000000 +#define KSPROBE_STREAMWRITE 0x00000001 +#define KSPROBE_ALLOCATEMDL 0x00000010 +#define KSPROBE_PROBEANDLOCK 0x00000020 +#define KSPROBE_SYSTEMADDRESS 0x00000040 +#define KSPROBE_MODIFY 0x00000200 +#define KSPROBE_STREAMWRITEMODIFY (KSPROBE_MODIFY | KSPROBE_STREAMWRITE) +#define KSPROBE_ALLOWFORMATCHANGE 0x00000080 + +#define KSSTREAM_READ KSPROBE_STREAMREAD +#define KSSTREAM_WRITE KSPROBE_STREAMWRITE +#define KSSTREAM_PAGED_DATA 0x00000000 +#define KSSTREAM_NONPAGED_DATA 0x00000100 +#define KSSTREAM_SYNCHRONOUS 0x00001000 +#define KSSTREAM_FAILUREEXCEPTION 0x00002000 + KSDDKAPI NTSTATUS NTAPI KsGenerateEvent( IN PKSEVENT_ENTRY EntryEvent);

1 0

[cfinck] 39700: Add a tool for converting the plaintext SVN passwd file to an Apache-compatible htpasswd file (for SVN WebDAV support) This problem came up when updating our SVN Server VM and the tool is now used there, but might be useful to others as well.
by cfinck＠svn.reactos.org 21 Feb '09

21 Feb '09

Author: cfinck Date: Sat Feb 21 22:51:30 2009 New Revision: 39700 URL: http://svn.reactos.org/svn/reactos?rev=39700&view=rev Log: Add a tool for converting the plaintext SVN passwd file to an Apache-compatible htpasswd file (for SVN WebDAV support) This problem came up when updating our SVN Server VM and the tool is now used there, but might be useful to others as well. Added: trunk/tools/csvnpass.c (with props) Added: trunk/tools/csvnpass.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/csvnpass.c?rev=39700&view=au… ============================================================================== --- trunk/tools/csvnpass.c (added) +++ trunk/tools/csvnpass.c [iso-8859-1] Sat Feb 21 22:51:30 2009 @@ -1,0 +1,156 @@ +/* csvnpass - Convert SVN passwd files to Apache htpasswd format + by Colin Finck (2009-02-21) + Licensed under GNU General Public License, version 2 or (at your option) any later version + + loosely based on the original htpasswd.c by Rob McCool +*/ + +#include <crypt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <time.h> + +const char Base64Characters[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz./"; + +void AddEntry(char* User, char* Password, FILE* fp) +{ + char* CryptedPassword; + char Salt[3]; + + srand((unsigned int)time(NULL)); + Salt[0] = Base64Characters[rand() % 64]; + Salt[1] = Base64Characters[rand() % 64]; + Salt[2] = 0; + CryptedPassword = crypt(Password, Salt); + + fprintf(fp, "%s:%s\n", User, CryptedPassword); +} + +void ProcessInput(char* pInput, FILE* fp) +{ + char InUsers = 0; + char* pLineBreak; + char* User; + size_t Length; + + for(;;) + { + /* Find the line break character (if any) and set it to 0, so we can treat pInput as a whole line */ + pLineBreak = strchr(pInput, '\n'); + + if(!pLineBreak) + break; + + *pLineBreak = 0; + + if(InUsers) + { + while(isspace(*pInput)) + ++pInput; + + /* Break if we're at the beginning of a new section */ + if(*pInput == '[') + break; + + /* The line may not begin with a comment character either */ + if(*pInput != '#') + { + /* The username ends at the equal sign or the first space */ + Length = strcspn(pInput, "= "); + + /* Store it */ + User = malloc(Length + 1); + memcpy(User, pInput, Length); + User[Length] = 0; + + /* Move to the password */ + pInput += Length; + pInput += strspn(pInput, "= "); + + /* Clear trailing password spaces (if any) */ + Length = strcspn(pInput, " "); + pInput[Length] = 0; + + AddEntry(User, pInput, fp); + + free(User); + } + } + else if(!strcmp(pInput, "[users]")) + { + InUsers = 1; + } + + /* Move to the next line */ + pInput = pLineBreak + 1; + } +} + +void PrintUsage() +{ + printf("csvnpass - Convert SVN passwd files to Apache htpasswd format\n"); + printf("by Colin Finck (2009-02-21)\n"); + printf("Usage: csvnpass input_file output_file\n"); +} + +int main(int argc, char *argv[]) +{ + char InUsers = 0; + char* InputFile = NULL; + char* pEqual; + char* pInput; + char* pLineBreak; + char* User = NULL; + int ReturnValue = 1; + FILE* fp = NULL; + struct stat StatBuffer; + + if(argc != 3) + { + PrintUsage(); + goto Cleanup; + } + + /* Read the entire input file */ + fp = fopen(argv[1], "r"); + + if(!fp) + { + fprintf(stderr, "Could not open input file!\n"); + goto Cleanup; + } + + if(fstat(fileno(fp), &StatBuffer)) + { + fprintf(stderr, "fstat failed for the input file!\n"); + goto Cleanup; + } + + InputFile = (char*)malloc(StatBuffer.st_size + 1); + fread(InputFile, StatBuffer.st_size, 1, fp); + InputFile[StatBuffer.st_size] = 0; + fclose(fp); + + /* Open the output file */ + fp = fopen(argv[2], "w"); + + if(!fp) + { + fprintf(stderr, "Could not open output file!\n"); + goto Cleanup; + } + + ProcessInput(InputFile, fp); + ReturnValue = 0; + +Cleanup: + if(fp) + fclose(fp); + + if(InputFile) + free(InputFile); + + return ReturnValue; +} Propchange: trunk/tools/csvnpass.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs