Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[ekohl] 47505: [SMSS] - Create a new default paging file if no paging files exist. - Set the calculated paging file sizes in the registry. - Remove predefined paging file name from the hivesys*.inf files. Fixes bug #4048.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jun 1 00:34:16 2010 New Revision: 47505 URL: http://svn.reactos.org/svn/reactos?rev=47505&view=rev Log: [SMSS] - Create a new default paging file if no paging files exist. - Set the calculated paging file sizes in the registry. - Remove predefined paging file name from the hivesys*.inf files. Fixes bug #4048. Modified: trunk/reactos/base/system/smss/initpage.c trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/base/system/smss/initpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initpage.… ============================================================================== --- trunk/reactos/base/system/smss/initpage.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initpage.c [iso-8859-1] Tue Jun 1 00:34:16 2010 @@ -225,34 +225,288 @@ } +static NTSTATUS +SmpGetFreeDiskSpace(IN PWSTR PageFileName, + OUT PLARGE_INTEGER FreeDiskSpaceInMB) +{ + FILE_FS_SIZE_INFORMATION FileFsSize; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE hFile; + UNICODE_STRING NtPathU; + LARGE_INTEGER FreeBytes; + OBJECT_ATTRIBUTES ObjectAttributes; + WCHAR RootPath[5]; + NTSTATUS Status; + + /* + * copy the drive letter, the colon and the slash, + * tack a null on the end + */ + RootPath[0] = PageFileName[0]; + RootPath[1] = L':'; + RootPath[2] = L'\\'; + RootPath[3] = L'\0'; + + DPRINT("Root drive X:\\...\"%S\"\n",RootPath); + + if (!RtlDosPathNameToNtPathName_U(RootPath, + &NtPathU, + NULL, + NULL)) + { + DPRINT1("Invalid path to root of drive\n"); + return STATUS_OBJECT_PATH_INVALID; + } + + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Get a handle to the root to find the free space on the drive */ + Status = NtCreateFile(&hFile, + 0, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not open a handle to the volume.\n"); + return Status; + } + + Status = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FileFsSize, + sizeof(FILE_FS_SIZE_INFORMATION), + FileFsSizeInformation); + + NtClose(hFile); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Querying the volume free space failed!\n"); + return Status; + } + + FreeBytes.QuadPart = FileFsSize.BytesPerSector * + FileFsSize.SectorsPerAllocationUnit * + FileFsSize.AvailableAllocationUnits.QuadPart; + + FreeDiskSpaceInMB->QuadPart = FreeBytes.QuadPart >> 20; + + return STATUS_SUCCESS; +} + + +static NTSTATUS +SmpSetDefaultPageFileData(IN PWSTR PageFileName, + IN PLARGE_INTEGER InitialSizeInMB, + IN PLARGE_INTEGER MaximumSizeInMB) +{ + WCHAR ValueString[MAX_PATH * 2]; + ULONG ValueLength; + + /* Format the value string */ + swprintf(ValueString, + L"%s %I64u %I64u", + PageFileName, + InitialSizeInMB->QuadPart, + MaximumSizeInMB->QuadPart); + + /* + * Append another zero character because it is a multi string value + * (REG_MULTI_SZ) and calculate the total string length. + */ + ValueLength = wcslen(ValueString) + 1; + ValueString[ValueLength] = 0; + ValueLength++; + + /* Write the page file data */ + return RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, + L"\\Session Manager\\Memory Management", + L"PagingFiles", + REG_MULTI_SZ, + ValueString, + ValueLength * sizeof(WCHAR)); +} + + +static NTSTATUS +SmpCreatePageFile(IN PWSTR PageFileName, + IN PLARGE_INTEGER InitialSizeInMB, + IN PLARGE_INTEGER MaximumSizeInMB) +{ + LARGE_INTEGER InitialSize; + LARGE_INTEGER MaximumSize; + UNICODE_STRING FileName; + NTSTATUS Status; + + /* Get the NT path name of the page file */ + if (!RtlDosPathNameToNtPathName_U(PageFileName, + &FileName, + NULL, + NULL)) + { + return STATUS_OBJECT_PATH_INVALID; + } + + /* Convert sizes in megabytes to sizes in bytes */ + InitialSize.QuadPart = InitialSizeInMB->QuadPart << 20; + MaximumSize.QuadPart = MaximumSizeInMB->QuadPart << 20; + + /* Create the pageing file */ + Status = NtCreatePagingFile(&FileName, + &InitialSize, + &MaximumSize, + 0); + if (! NT_SUCCESS(Status)) + { + DPRINT("Creation of paging file %wZ with size %I64d MB failed (status 0x%x)\n", + &FileName, InitialSizeInMB->QuadPart, Status); + } + + /* Release the file name */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileName.Buffer); + + return Status; +} + + +static NTSTATUS +SmpCreateDefaultPagingFile(VOID) +{ + SYSTEM_BASIC_INFORMATION SysBasicInfo; + LARGE_INTEGER MemorySizeInMB; + LARGE_INTEGER FreeDiskSpaceInMB; + LARGE_INTEGER InitialSizeInMB; + LARGE_INTEGER MaximumSizeInMB; + NTSTATUS Status = STATUS_SUCCESS; + WCHAR PageFileName[MAX_PATH]; + + DPRINT("Creating a default paging file\n"); + + Status = NtQuerySystemInformation(SystemBasicInformation, + &SysBasicInfo, + sizeof(SysBasicInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not query for physical memory size.\n"); + return Status; + } + + DPRINT("PageSize: %d, PhysicalPages: %d, TotalMem: %d\n", + SysBasicInfo.PageSize, + SysBasicInfo.NumberOfPhysicalPages, + (SysBasicInfo.NumberOfPhysicalPages * SysBasicInfo.PageSize) / 1024); + + MemorySizeInMB.QuadPart = (SysBasicInfo.NumberOfPhysicalPages * SysBasicInfo.PageSize) >> 20; + + DPRINT("MemorySize %I64u MB\n", + MemorySizeInMB.QuadPart); + + /* Build the default page file name */ + PageFileName[0] = SharedUserData->NtSystemRoot[0]; + PageFileName[1] = 0; + wcscat(PageFileName, L":\\pagefile.sys"); + + Status = SmpGetFreeDiskSpace(PageFileName, + &FreeDiskSpaceInMB); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT("FreeDiskSpace %I64u MB\n", + FreeDiskSpaceInMB.QuadPart); + + InitialSizeInMB.QuadPart = MemorySizeInMB.QuadPart + (MemorySizeInMB.QuadPart / 2); + MaximumSizeInMB.QuadPart = InitialSizeInMB.QuadPart * 2; + + if (InitialSizeInMB.QuadPart > (FreeDiskSpaceInMB.QuadPart / 4)) + { + DPRINT("Inital Size took more then 25%% of free disk space\n"); + + /* + * Set by percentage of free space + * intial is 20%, and max is 25% + */ + InitialSizeInMB.QuadPart = FreeDiskSpaceInMB.QuadPart / 5; + MaximumSizeInMB.QuadPart = FreeDiskSpaceInMB.QuadPart / 4; + + /* The page file is more then a gig, size it down */ + if (InitialSizeInMB.QuadPart > 1024) + { + InitialSizeInMB.QuadPart = 1024; /* 1GB */ + MaximumSizeInMB.QuadPart = 1536; /* 1.5GB */ + } + } + + DPRINT("InitialSize %I64u MB MaximumSize %I64u MB\n", + InitialSizeInMB.QuadPart, + MaximumSizeInMB.QuadPart); + + Status = SmpSetDefaultPageFileData(PageFileName, + &InitialSizeInMB, + &MaximumSizeInMB); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + return SmpCreatePageFile(PageFileName, + &InitialSizeInMB, + &MaximumSizeInMB); +} + + NTSTATUS SmCreatePagingFiles(VOID) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; - - DPRINT("creating system paging files\n"); - /* - * Disable paging file on MiniNT/Live CD. - */ - if (RtlCheckRegistryKey(RTL_REGISTRY_CONTROL, L"MiniNT") == STATUS_SUCCESS) - { - return STATUS_SUCCESS; - } - - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"PagingFiles"; - QueryTable[0].QueryRoutine = SmpPagingFilesQueryRoutine; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager\\Memory Management", - QueryTable, - NULL, - NULL); - - return(Status); + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + DPRINT("creating system paging files\n"); + + /* Disable paging file on MiniNT/Live CD. */ + if (RtlCheckRegistryKey(RTL_REGISTRY_CONTROL, L"MiniNT") == STATUS_SUCCESS) + { + return STATUS_SUCCESS; + } + + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L"PagingFiles"; + QueryTable[0].QueryRoutine = SmpPagingFilesQueryRoutine; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"\\Session Manager\\Memory Management", + QueryTable, + NULL, + NULL); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + Status = SmpCreateDefaultPagingFile(); + } + + return Status; } Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Tue Jun 1 00:34:16 2010 @@ -783,9 +783,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","wininet",0x00000000,"wininet.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","wldap32",0x00000000,"wldap32.dll" -; Pagefile settings -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","PagingFiles",0x00010000, \ - "C:\pagefile.sys" +; Memory Management +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Jun 1 00:34:16 2010 @@ -930,9 +930,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","wininet",0x00000000,"wininet.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","wldap32",0x00000000,"wldap32.dll" -; Pagefile settings -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","PagingFiles",0x00010000, \ - "C:\pagefile.sys" +; Memory Management +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,""

14 years, 7 months

[gschneider] 47504: [RAPPS] Create a new download directory if the user agrees to do so, based on a patch by Seungju Kim. Translations except German and English should be updated to reflect the changed intention. See issue #5196 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon May 31 22:09:13 2010 New Revision: 47504 URL: http://svn.reactos.org/svn/reactos?rev=47504&view=rev Log: [RAPPS] Create a new download directory if the user agrees to do so, based on a patch by Seungju Kim. Translations except German and English should be updated to reflect the changed intention. See issue #5196 for more details. Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/settingsdlg.c Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Mon May 31 22:09:13 2010 @@ -185,7 +185,7 @@ IDS_UPDATES "Aktualisierungen" IDS_APPLICATIONS "Anwendungen" IDS_CHOOSE_FOLDER_TEXT "Wählen Sie ein Verzeichnis aus, das zum Herunterladen verwendet werden soll:" - IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existentes Verzeichnis angegeben!" + IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existierendes Verzeichnis angegeben! Neu anlegen?" IDS_USER_NOT_ADMIN "Sie müssen als Administrator angemeldet sein, um den Anwendungsmanager zu starten!" IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen möchten?" IDS_INFORMATION "Informationen" Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Mon May 31 22:09:13 2010 @@ -185,7 +185,7 @@ IDS_UPDATES "Updates" IDS_APPLICATIONS "Applications" IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will store Downloads:" - IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist." + IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist. Create it?" IDS_USER_NOT_ADMIN "You must be an administrator to start ""ReactOS Applications Manager""!" IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "Information" Modified: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] Mon May 31 22:09:13 2010 @@ -115,7 +115,14 @@ IDS_CHOOSE_FOLDER_ERROR, szMsgText, sizeof(szMsgText) / sizeof(WCHAR)); - MessageBoxW(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR); + if (MessageBoxW(hDlg, szMsgText, NULL, MB_YESNO) == IDYES) + { + if (CreateDirectoryW(szDir, NULL)) + { + EndDialog(hDlg, LOWORD(wParam)); + } + } + SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT)); break; }

14 years, 7 months

[gschneider] 47503: [EXPLORER_NEW] Display a message box if the explorer registry key cannot be loaded, patch by Katayama Hirofumi See issue #5407 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon May 31 21:16:14 2010 New Revision: 47503 URL: http://svn.reactos.org/svn/reactos?rev=47503&view=rev Log: [EXPLORER_NEW] Display a message box if the explorer registry key cannot be loaded, patch by Katayama Hirofumi See issue #5407 for more details. Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc trunk/reactos/base/shell/explorer-new/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/lang/en-US.rc trunk/reactos/base/shell/explorer-new/lang/es-ES.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc trunk/reactos/base/shell/explorer-new/lang/no-NO.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/resource.h Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Mon May 31 21:16:14 2010 @@ -284,7 +284,9 @@ TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"), &hkExplorer) != ERROR_SUCCESS) { - /* FIXME - display error */ + TCHAR Message[256]; + LoadString(hInstance, IDS_STARTUP_ERROR, Message, 256); + MessageBox(NULL, Message, NULL, MB_ICONERROR); return 1; } Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -121,6 +121,7 @@ IDS_PROPERTIES "&Ñâîéñòâà" IDS_OPEN_ALL_USERS "&Îòâàðÿíå íà âñè÷êè ïîòðåáèòåëè" IDS_EXPLORE_ALL_USERS "&Ðàçëèñòâàíå íà âñè÷êè ïîòðåáèòåëè" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -126,6 +126,7 @@ IDS_PROPERTIES "Vl&astnosti" IDS_OPEN_ALL_USERS "Ote&vøít sloku All Users" IDS_EXPLORE_ALL_USERS "Pro&cházet sloku All Users" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "E&igenschaften" IDS_OPEN_ALL_USERS "Öffnen (&Alle Benutzer)" IDS_EXPLORE_ALL_USERS "Explorer (A&lle Benutzer)" + IDS_STARTUP_ERROR "Das System kann den Explorer nicht starten, weil die Registrierung nicht verfügbar bzw. fehlerhaft ist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "P&roperties" IDS_OPEN_ALL_USERS "O&pen All Users" IDS_EXPLORE_ALL_USERS "E&xplore All Users" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -129,6 +129,7 @@ IDS_PROPERTIES "P&ropiedades" IDS_OPEN_ALL_USERS "A&brir todos los usuarios" IDS_EXPLORE_ALL_USERS "E&xplorar todos los usuarios" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "P&ropriétés" IDS_OPEN_ALL_USERS "Ouvrir tous les utilisateurs" IDS_EXPLORE_ALL_USERS "E&xplorer tous les utilisateurs" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "&Proprietà" IDS_OPEN_ALL_USERS "&Apri tutti gli utenti" IDS_EXPLORE_ALL_USERS "&Esplora tutti gli utenti" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "vpeB(&R)" IDS_OPEN_ALL_USERS "J - All Users(&P)" IDS_EXPLORE_ALL_USERS "GNXv[ - All Users(&E)" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -125,6 +125,7 @@ IDS_PROPERTIES "¼Ó¼º(&R)" IDS_OPEN_ALL_USERS "¿±â - All Users(&P)" IDS_EXPLORE_ALL_USERS "Å½»ö - All Users(&X)" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -124,6 +124,7 @@ IDS_PROPERTIES "&Parametrai" IDS_OPEN_ALL_USERS "&Atverti visus vartotojus" IDS_EXPLORE_ALL_USERS "&Narðyti visus vartotojus" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "&Eigenschappen" IDS_OPEN_ALL_USERS "&Alle Gebruikers weergeven" IDS_EXPLORE_ALL_USERS "Alle Gebruikers V&erkennen" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "E&genskaper" IDS_OPEN_ALL_USERS "Å&pne alle brukere" IDS_EXPLORE_ALL_USERS "U&tforsk alle brukere" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -123,6 +123,7 @@ IDS_PROPERTIES "W³a&ciwoci" IDS_OPEN_ALL_USERS "&Otwórz - wszyscy u¿ytkownicy" IDS_EXPLORE_ALL_USERS "&Eksploruj - wszyscy u¿ytkownicy" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "P&roprietãþi" IDS_OPEN_ALL_USERS "Deschidere& Toþi Utilizatorii" IDS_EXPLORE_ALL_USERS "E&xplorare Toþi Utilizatorii" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -122,6 +122,7 @@ IDS_PROPERTIES "&Ñâîéñòâà" IDS_OPEN_ALL_USERS "&Âñå ïîëüçîâàòåëè" IDS_EXPLORE_ALL_USERS "&Îáçîð Âñåõ ïîëüçîâàòåëåé" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "Vl&astnosti" IDS_OPEN_ALL_USERS "&Otvori profil All Users" IDS_EXPLORE_ALL_USERS "&Preskúma profil All Users" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -128,6 +128,7 @@ IDS_PROPERTIES "Â&ëàñòèâîñò³" IDS_OPEN_ALL_USERS "&Âñ³ êîðèñòóâà÷³" IDS_EXPLORE_ALL_USERS "&Îãëÿä âñ³õ êîðèñòóâà÷³â" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer-new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… ============================================================================== --- trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] Mon May 31 21:16:14 2010 @@ -8,6 +8,7 @@ #define IDS_PROPERTIES 102 #define IDS_OPEN_ALL_USERS 103 #define IDS_EXPLORE_ALL_USERS 104 +#define IDS_STARTUP_ERROR 105 #define IDC_STARTBTN 304

14 years, 7 months

[gschneider] 47502: [CMD] Protect certain actions with a critical section, patch by Katayama Hirofumi See issue #5406 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon May 31 20:38:48 2010 New Revision: 47502 URL: http://svn.reactos.org/svn/reactos?rev=47502&view=rev Log: [CMD] Protect certain actions with a critical section, patch by Katayama Hirofumi See issue #5406 for more details. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon May 31 20:38:48 2010 @@ -156,7 +156,7 @@ BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ INT nErrorLevel = 0; /* Errorlevel of last launched external program */ -BOOL bChildProcessRunning = FALSE; +CRITICAL_SECTION ChildProcessRunningLock; BOOL bUnicodeOutput = FALSE; BOOL bDisableBatchEcho = FALSE; BOOL bDelayedExpansion = FALSE; @@ -436,14 +436,12 @@ { if (IsConsoleProcess(prci.hProcess)) { - /* FIXME: Protect this with critical section */ - bChildProcessRunning = TRUE; + EnterCriticalSection(&ChildProcessRunningLock); dwChildProcessId = prci.dwProcessId; WaitForSingleObject (prci.hProcess, INFINITE); - /* FIXME: Protect this with critical section */ - bChildProcessRunning = FALSE; + LeaveCriticalSection(&ChildProcessRunningLock); GetExitCodeProcess (prci.hProcess, &dwExitCode); nErrorLevel = (INT)dwExitCode; @@ -665,9 +663,9 @@ SetStdHandle(STD_INPUT_HANDLE, hOldConIn); /* Wait for all processes to complete */ - bChildProcessRunning = TRUE; + EnterCriticalSection(&ChildProcessRunningLock); WaitForMultipleObjects(nProcesses, hProcess, TRUE, INFINITE); - bChildProcessRunning = FALSE; + LeaveCriticalSection(&ChildProcessRunningLock); /* Use the exit code of the last process in the pipeline */ GetExitCodeProcess(hProcess[nProcesses - 1], &dwExitCode); @@ -1439,13 +1437,16 @@ } } - if (bChildProcessRunning == TRUE) + if (!TryEnterCriticalSection(&ChildProcessRunningLock)) { SelfGenerated = TRUE; GenerateConsoleCtrlEvent (dwCtrlType, 0); return TRUE; } - + else + { + LeaveCriticalSection(&ChildProcessRunningLock); + } rec.EventType = KEY_EVENT; rec.Event.KeyEvent.bKeyDown = TRUE; @@ -1797,6 +1798,7 @@ RemoveBreakHandler (); SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ), ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT ); + DeleteCriticalSection(&ChildProcessRunningLock); } /* @@ -1808,6 +1810,7 @@ TCHAR startPath[MAX_PATH]; CONSOLE_SCREEN_BUFFER_INFO Info; + InitializeCriticalSection(&ChildProcessRunningLock); lpOriginalEnvironment = DuplicateEnvironment(); GetCurrentDirectory(MAX_PATH,startPath);

14 years, 7 months

[cgutman] 47501: [MSAFD] - Msafd is really just a stub that points to mswsock

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon May 31 20:17:05 2010 New Revision: 47501 URL: http://svn.reactos.org/svn/reactos?rev=47501&view=rev Log: [MSAFD] - Msafd is really just a stub that points to mswsock Removed: branches/aicom-network-branch/dll/win32/msafd/include/ branches/aicom-network-branch/dll/win32/msafd/misc/ branches/aicom-network-branch/dll/win32/msafd/msafd.h Modified: branches/aicom-network-branch/dll/win32/msafd/msafd.rbuild branches/aicom-network-branch/dll/win32/msafd/msafd.spec Removed: branches/aicom-network-branch/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/msafd/msafd.h (removed) @@ -1,475 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/msafd.h - * PURPOSE: Ancillary Function Driver DLL header - */ -#ifndef __MSAFD_H -#define __MSAFD_H - -#include <stdio.h> -#include <stdlib.h> - -#define WIN32_NO_STATUS -#include <winsock2.h> -#include <windows.h> -#include <ws2spi.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -/* This includes ntsecapi.h so it needs to come after the NDK */ -#include <wsahelp.h> -#include <tdi.h> -#include <afd/shared.h> -#include <helpers.h> - -extern HANDLE GlobalHeap; -extern WSPUPCALLTABLE Upcalls; -extern LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; -extern LIST_ENTRY SockHelpersListHead; -extern HANDLE SockEvent; -extern HANDLE SockAsyncCompletionPort; -extern BOOLEAN SockAsyncSelectCalled; - -typedef enum _SOCKET_STATE { - SocketOpen, - SocketBound, - SocketBoundUdp, - SocketConnected, - SocketClosed -} SOCKET_STATE, *PSOCKET_STATE; - -typedef struct _SOCK_SHARED_INFO { - SOCKET_STATE State; - INT AddressFamily; - INT SocketType; - INT Protocol; - INT SizeOfLocalAddress; - INT SizeOfRemoteAddress; - struct linger LingerData; - ULONG SendTimeout; - ULONG RecvTimeout; - ULONG SizeOfRecvBuffer; - ULONG SizeOfSendBuffer; - struct { - BOOLEAN Listening:1; - BOOLEAN Broadcast:1; - BOOLEAN Debug:1; - BOOLEAN OobInline:1; - BOOLEAN ReuseAddresses:1; - BOOLEAN ExclusiveAddressUse:1; - BOOLEAN NonBlocking:1; - BOOLEAN DontUseWildcard:1; - BOOLEAN ReceiveShutdown:1; - BOOLEAN SendShutdown:1; - BOOLEAN UseDelayedAcceptance:1; - BOOLEAN UseSAN:1; - }; // Flags - DWORD CreateFlags; - DWORD CatalogEntryId; - DWORD ServiceFlags1; - DWORD ProviderFlags; - GROUP GroupID; - DWORD GroupType; - INT GroupPriority; - INT SocketLastError; - HWND hWnd; - LONG Unknown; - DWORD SequenceNumber; - UINT wMsg; - LONG AsyncEvents; - LONG AsyncDisabledEvents; -} SOCK_SHARED_INFO, *PSOCK_SHARED_INFO; - -typedef struct _SOCKET_INFORMATION { - ULONG RefCount; - SOCKET Handle; - SOCK_SHARED_INFO SharedData; - DWORD HelperEvents; - PHELPER_DATA HelperData; - PVOID HelperContext; - PSOCKADDR LocalAddress; - PSOCKADDR RemoteAddress; - HANDLE TdiAddressHandle; - HANDLE TdiConnectionHandle; - PVOID AsyncData; - HANDLE EventObject; - LONG NetworkEvents; - CRITICAL_SECTION Lock; - PVOID SanData; - BOOL TrySAN; - SOCKADDR WSLocalAddress; - SOCKADDR WSRemoteAddress; -} SOCKET_INFORMATION, *PSOCKET_INFORMATION; - - -typedef struct _SOCKET_CONTEXT { - SOCK_SHARED_INFO SharedData; - ULONG SizeOfHelperData; - ULONG Padding; - SOCKADDR LocalAddress; - SOCKADDR RemoteAddress; - /* Plus Helper Data */ -} SOCKET_CONTEXT, *PSOCKET_CONTEXT; - -typedef struct _ASYNC_DATA { - PSOCKET_INFORMATION ParentSocket; - DWORD SequenceNumber; - IO_STATUS_BLOCK IoStatusBlock; - AFD_POLL_INFO AsyncSelectInfo; -} ASYNC_DATA, *PASYNC_DATA; - -SOCKET -WSPAPI -WSPAccept( - IN SOCKET s, - OUT LPSOCKADDR addr, - IN OUT LPINT addrlen, - IN LPCONDITIONPROC lpfnCondition, - IN DWORD dwCallbackData, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPAddressToString( - IN LPSOCKADDR lpsaAddress, - IN DWORD dwAddressLength, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPWSTR lpszAddressString, - IN OUT LPDWORD lpdwAddressStringLength, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPAsyncSelect( - IN SOCKET s, - IN HWND hWnd, - IN UINT wMsg, - IN LONG lEvent, - OUT LPINT lpErrno); - -INT -WSPAPI WSPBind( - IN SOCKET s, - IN CONST SOCKADDR *name, - IN INT namelen, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPCancelBlockingCall( - OUT LPINT lpErrno); - -INT -WSPAPI -WSPCleanup( - OUT LPINT lpErrno); - -INT -WSPAPI -WSPCloseSocket( - IN SOCKET s, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPConnect( - IN SOCKET s, - IN CONST SOCKADDR *name, - IN INT namelen, - IN LPWSABUF lpCallerData, - OUT LPWSABUF lpCalleeData, - IN LPQOS lpSQOS, - IN LPQOS lpGQOS, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPDuplicateSocket( - IN SOCKET s, - IN DWORD dwProcessId, - OUT LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPEnumNetworkEvents( - IN SOCKET s, - IN WSAEVENT hEventObject, - OUT LPWSANETWORKEVENTS lpNetworkEvents, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPEventSelect( - IN SOCKET s, - IN WSAEVENT hEventObject, - IN LONG lNetworkEvents, - OUT LPINT lpErrno); - -BOOL -WSPAPI -WSPGetOverlappedResult( - IN SOCKET s, - IN LPWSAOVERLAPPED lpOverlapped, - OUT LPDWORD lpcbTransfer, - IN BOOL fWait, - OUT LPDWORD lpdwFlags, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPGetPeerName( - IN SOCKET s, - OUT LPSOCKADDR name, - IN OUT LPINT namelen, - OUT LPINT lpErrno); - -BOOL -WSPAPI -WSPGetQOSByName( - IN SOCKET s, - IN OUT LPWSABUF lpQOSName, - OUT LPQOS lpQOS, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPGetSockName( - IN SOCKET s, - OUT LPSOCKADDR name, - IN OUT LPINT namelen, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPGetSockOpt( - IN SOCKET s, - IN INT level, - IN INT optname, - OUT CHAR FAR* optval, - IN OUT LPINT optlen, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPIoctl( - IN SOCKET s, - IN DWORD dwIoControlCode, - IN LPVOID lpvInBuffer, - IN DWORD cbInBuffer, - OUT LPVOID lpvOutBuffer, - IN DWORD cbOutBuffer, - OUT LPDWORD lpcbBytesReturned, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -SOCKET -WSPAPI -WSPJoinLeaf( - IN SOCKET s, - IN CONST SOCKADDR *name, - IN INT namelen, - IN LPWSABUF lpCallerData, - OUT LPWSABUF lpCalleeData, - IN LPQOS lpSQOS, - IN LPQOS lpGQOS, - IN DWORD dwFlags, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPListen( - IN SOCKET s, - IN INT backlog, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPRecv( - IN SOCKET s, - IN OUT LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd, - IN OUT LPDWORD lpFlags, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPRecvDisconnect( - IN SOCKET s, - OUT LPWSABUF lpInboundDisconnectData, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPRecvFrom( - IN SOCKET s, - IN OUT LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd, - IN OUT LPDWORD lpFlags, - OUT LPSOCKADDR lpFrom, - IN OUT LPINT lpFromlen, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSelect( - IN INT nfds, - IN OUT LPFD_SET readfds, - IN OUT LPFD_SET writefds, - IN OUT LPFD_SET exceptfds, - IN CONST LPTIMEVAL timeout, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSend( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent, - IN DWORD dwFlags, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSendDisconnect( - IN SOCKET s, - IN LPWSABUF lpOutboundDisconnectData, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSendTo( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent, - IN DWORD dwFlags, - IN CONST SOCKADDR *lpTo, - IN INT iTolen, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSetSockOpt( - IN SOCKET s, - IN INT level, - IN INT optname, - IN CONST CHAR FAR* optval, - IN INT optlen, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPShutdown( - IN SOCKET s, - IN INT how, - OUT LPINT lpErrno); - -SOCKET -WSPAPI -WSPSocket( - IN INT af, - IN INT type, - IN INT protocol, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - IN GROUP g, - IN DWORD dwFlags, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPStringToAddress( - IN LPWSTR AddressString, - IN INT AddressFamily, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPSOCKADDR lpAddress, - IN OUT LPINT lpAddressLength, - OUT LPINT lpErrno); - - -PSOCKET_INFORMATION GetSocketStructure( - SOCKET Handle -); - -VOID DeleteSocketStructure( SOCKET Handle ); - -int GetSocketInformation( - PSOCKET_INFORMATION Socket, - ULONG AfdInformationClass, - PULONG Ulong OPTIONAL, - PLARGE_INTEGER LargeInteger OPTIONAL -); - -int SetSocketInformation( - PSOCKET_INFORMATION Socket, - ULONG AfdInformationClass, - PULONG Ulong OPTIONAL, - PLARGE_INTEGER LargeInteger OPTIONAL -); - -int CreateContext( - PSOCKET_INFORMATION Socket -); - -int SockAsyncThread( - PVOID ThreadParam -); - -VOID -SockProcessAsyncSelect( - PSOCKET_INFORMATION Socket, - PASYNC_DATA AsyncData -); - -VOID -SockAsyncSelectCompletionRoutine( - PVOID Context, - PIO_STATUS_BLOCK IoStatusBlock -); - -BOOLEAN -SockCreateOrReferenceAsyncThread( - VOID -); - -BOOLEAN SockGetAsyncSelectHelperAfdHandle( - VOID -); - -VOID SockProcessQueuedAsyncSelect( - PVOID Context, - PIO_STATUS_BLOCK IoStatusBlock -); - -VOID -SockReenableAsyncSelectEvent ( - IN PSOCKET_INFORMATION Socket, - IN ULONG Event - ); - -DWORD MsafdReturnWithErrno( NTSTATUS Status, LPINT Errno, DWORD Received, - LPDWORD ReturnedBytes ); - -typedef VOID (*PASYNC_COMPLETION_ROUTINE)(PVOID Context, PIO_STATUS_BLOCK IoStatusBlock); - -#endif /* __MSAFD_H */ - -/* EOF */ Modified: branches/aicom-network-branch/dll/win32/msafd/msafd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/msafd/msafd.rbuild [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/msafd/msafd.rbuild [iso-8859-1] Mon May 31 20:17:05 2010 @@ -1,17 +1,4 @@ -<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll" unicode="yes"> +<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" entrypoint="0" installbase="system32" installname="msafd.dll" unicode="yes"> <importlibrary definition="msafd.spec" /> - <include base="msafd">.</include> - <include base="msafd">include</include> - <include base="ReactOS">include/reactos/drivers</include> - <pch>msafd.h</pch> - <library>ntdll</library> - <library>advapi32</library> - <directory name="misc"> - <file>dllmain.c</file> - <file>event.c</file> - <file>helpers.c</file> - <file>sndrcv.c</file> - <file>stubs.c</file> - </directory> <file>msafd.rc</file> </module> Modified: branches/aicom-network-branch/dll/win32/msafd/msafd.spec URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/msafd/msafd.spec [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/msafd/msafd.spec [iso-8859-1] Mon May 31 20:17:05 2010 @@ -1,1 +1,1 @@ -@ stdcall WSPStartup (long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall WSPStartup (long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) mswsock.WSPStartup

14 years, 7 months

[gadamopoulos] 47500: [win32k] - Rename co_IntCreateWindowEx to co_UserCreateWindowEx and refactor it to make it readable - Also fix the sequence of messages in co_UserCreateWindowEx

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon May 31 19:58:05 2010 New Revision: 47500 URL: http://svn.reactos.org/svn/reactos?rev=47500&view=rev Log: [win32k] - Rename co_IntCreateWindowEx to co_UserCreateWindowEx and refactor it to make it readable - Also fix the sequence of messages in co_UserCreateWindowEx Modified: trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Mon May 31 19:58:05 2010 @@ -78,6 +78,9 @@ OUT PCLS **Link OPTIONAL); PCLS +IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance); + +PCLS FASTCALL IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Mon May 31 19:58:05 2010 @@ -155,7 +155,7 @@ VOID FASTCALL IntNotifyWinEvent(DWORD, PWND, LONG, LONG); -PWND APIENTRY co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PLARGE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL); +PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW*, PUNICODE_STRING, PLARGE_STRING); WNDPROC FASTCALL IntGetWindowProc(PWND,BOOL); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] Mon May 31 19:58:05 2010 @@ -25,6 +25,8 @@ INT cy, UINT flags); BOOLEAN FASTCALL co_WinPosShowWindow(PWINDOW_OBJECT Window, INT Cmd); +void FASTCALL +co_WinPosSendSizeMove(PWINDOW_OBJECT Window); USHORT FASTCALL co_WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, PUSER_MESSAGE_QUEUE OnlyHitTests, POINT *WinPoint, PWINDOW_OBJECT* Window); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Mon May 31 19:58:05 2010 @@ -1207,6 +1207,57 @@ return Atom; } +PCLS +IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance) +{ + PCLS *ClassLink, Class = NULL; + RTL_ATOM ClassAtom; + PTHREADINFO pti; + + pti = PsGetCurrentThreadWin32Thread(); + + if ( !(pti->ppi->W32PF_flags & W32PF_CLASSESREGISTERED )) + { + UserRegisterSystemClasses(); + } + + /* Check the class. */ + + DPRINT("Class %wZ\n", ClassName); + + ClassAtom = IntGetClassAtom(ClassName, + hInstance, + pti->ppi, + &Class, + &ClassLink); + + if (ClassAtom == (RTL_ATOM)0) + { + if (IS_ATOM(ClassName->Buffer)) + { + DPRINT1("Class 0x%p not found\n", (DWORD_PTR) ClassName->Buffer); + } + else + { + DPRINT1("Class \"%wZ\" not found\n", ClassName); + } + + SetLastWin32Error(ERROR_CANNOT_FIND_WND_CLASS); + return NULL; + } + DPRINT("ClassAtom %x\n", ClassAtom); + Class = IntReferenceClass(Class, + ClassLink, + pti->rpdesk); + if (Class == NULL) + { + DPRINT1("Failed to reference window class!\n"); + return NULL; + } + + return Class; +} + RTL_ATOM UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Mon May 31 19:58:05 2010 @@ -885,6 +885,7 @@ UNICODE_STRING ClassName, MenuName; LARGE_STRING WindowName; PWND pWnd = NULL; + CREATESTRUCTW Cs; DECLARE_RETURN(HDESK); DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName); @@ -1079,20 +1080,14 @@ RtlZeroMemory(&MenuName, sizeof(MenuName)); RtlZeroMemory(&WindowName, sizeof(WindowName)); - pWnd = co_IntCreateWindowEx( 0, - &ClassName, - &WindowName, - (WS_POPUP|WS_CLIPCHILDREN), - 0, - 0, - 100, - 100, - NULL, - NULL, - hModClient, - NULL, - 0, - TRUE); + RtlZeroMemory(&Cs, sizeof(Cs)); + Cs.cx = Cs.cy = 100; + Cs.style = WS_POPUP|WS_CLIPCHILDREN; + Cs.hInstance = hModClient; + Cs.lpszName = (LPCWSTR) &WindowName; + Cs.lpszClass = (LPCWSTR) &ClassName; + + pWnd = co_UserCreateWindowEx(&Cs, &ClassName, &WindowName); if (!pWnd) { DPRINT1("Failed to create Message window handle\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon May 31 19:58:05 2010 @@ -1603,244 +1603,125 @@ return Ret; } - -/* - * calculates the default position of a window - */ -BOOL FASTCALL -IntCalcDefPosSize(PWINDOW_OBJECT Parent, RECTL *rc, BOOL IncPos) -{ - SIZE Sz; - PMONITOR pMonitor; - POINT Pos = {0, 0}; - - pMonitor = IntGetPrimaryMonitor(); - - if(Parent != NULL) - { - RECTL_bIntersectRect(rc, rc, &pMonitor->rcMonitor); - - if(IncPos) - { - Pos.x = pMonitor->cWndStack * (UserGetSystemMetrics(SM_CXSIZE) + UserGetSystemMetrics(SM_CXFRAME)); - Pos.y = pMonitor->cWndStack * (UserGetSystemMetrics(SM_CYSIZE) + UserGetSystemMetrics(SM_CYFRAME)); - if (Pos.x > ((rc->right - rc->left) / 4) || - Pos.y > ((rc->bottom - rc->top) / 4)) - { - /* reset counter and position */ - Pos.x = 0; - Pos.y = 0; - pMonitor->cWndStack = 0; - } - pMonitor->cWndStack++; - } - Pos.x += rc->left; - Pos.y += rc->top; +void FASTCALL +IntFixWindowCoordinates(CREATESTRUCTW* Cs, PWINDOW_OBJECT ParentWindow, DWORD* dwShowMode) +{ +#define IS_DEFAULT(x) ((x) == CW_USEDEFAULT || (x) == (SHORT)0x8000) + + /* default positioning for overlapped windows */ + if(!(Cs->style & (WS_POPUP | WS_CHILD))) + { + RECTL rc, WorkArea; + PRTL_USER_PROCESS_PARAMETERS ProcessParams; + + UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); + + rc = WorkArea; + ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters; + + if (IS_DEFAULT(Cs->x)) + { + if (!IS_DEFAULT(Cs->y)) *dwShowMode = Cs->y; + + if(ProcessParams->WindowFlags & STARTF_USEPOSITION) + { + Cs->x = ProcessParams->StartingX; + Cs->y = ProcessParams->StartingY; + } + else + { + Cs->x = WorkArea.left; + Cs->y = WorkArea.top; + } + } + + if (IS_DEFAULT(Cs->cx)) + { + if (ProcessParams->WindowFlags & STARTF_USEPOSITION) + { + Cs->cx = ProcessParams->CountX; + Cs->cy = ProcessParams->CountY; + } + else + { + Cs->cx = (WorkArea.right - WorkArea.left) * 3 / 4 - Cs->x; + Cs->cy = (WorkArea.bottom - WorkArea.top) * 3 / 4 - Cs->y; + } + } + /* neither x nor cx are default. Check the y values . + * In the trace we see Outlook and Outlook Express using + * cy set to CW_USEDEFAULT when opening the address book. + */ + else if (IS_DEFAULT(Cs->cy)) + { + DPRINT("Strange use of CW_USEDEFAULT in nHeight\n"); + Cs->cy = (WorkArea.bottom - WorkArea.top) * 3 / 4 - Cs->y; + } } else { - Pos.x = rc->left; - Pos.y = rc->top; - } - - Sz.cx = EngMulDiv(rc->right - rc->left, 3, 4); - Sz.cy = EngMulDiv(rc->bottom - rc->top, 3, 4); - - rc->left = Pos.x; - rc->top = Pos.y; - rc->right = rc->left + Sz.cx; - rc->bottom = rc->top + Sz.cy; - return TRUE; -} - - -/* - * @implemented - */ -PWND APIENTRY -co_IntCreateWindowEx(DWORD dwExStyle, - PUNICODE_STRING ClassName, - PLARGE_STRING WindowName, - DWORD dwStyle, - LONG x, - LONG y, - LONG nWidth, - LONG nHeight, - HWND hWndParent, - HMENU hMenu, - HINSTANCE hInstance, - LPVOID lpParam, - DWORD dwShowMode, - BOOL bUnicodeWindow) -{ - PWINSTATION_OBJECT WinSta; + /* if CW_USEDEFAULT is set for non-overlapped windows, both values are set to zero */ + if(IS_DEFAULT(Cs->x)) + { + Cs->x = 0; + Cs->y = 0; + } + if(IS_DEFAULT(Cs->cx)) + { + Cs->cx = 0; + Cs->cy = 0; + } + } + +#undef IS_DEFAULT +} + +/* Allocates and initializes a window*/ +PWINDOW_OBJECT FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, + PLARGE_STRING WindowName, + PCLS Class, + PWINDOW_OBJECT ParentWindow, + PWINDOW_OBJECT OwnerWindow) +{ PWND Wnd = NULL; - PCLS *ClassLink, Class = NULL; - RTL_ATOM ClassAtom; - PWINDOW_OBJECT Window = NULL; - PWINDOW_OBJECT ParentWindow = NULL, OwnerWindow; - HWND ParentWindowHandle = NULL; - HWND OwnerWindowHandle; + PWINDOW_OBJECT Window; + HWND hWnd; + PTHREADINFO pti = NULL; PMENU_OBJECT SystemMenu; - HWND hWnd; - POINT Pos; - SIZE Size; - PTHREADINFO ti = NULL; -#if 0 - - POINT MaxSize, MaxPos, MinTrack, MaxTrack; -#else - - POINT MaxPos; -#endif - CREATESTRUCTW Cs; - CBT_CREATEWNDW CbtCreate; - LRESULT Result; BOOL MenuChanged; - DECLARE_RETURN(PWND); - BOOL HasOwner; - USER_REFERENCE_ENTRY ParentRef, Ref; - PTHREADINFO pti; + BOOL bUnicodeWindow; pti = PsGetCurrentThreadWin32Thread(); - if (pti->rpdesk) - { - ParentWindowHandle = pti->rpdesk->DesktopWindow; - } - - - if ( !(pti->ppi->W32PF_flags & W32PF_CLASSESREGISTERED )) - { - UserRegisterSystemClasses(); - } - - OwnerWindowHandle = NULL; - - DPRINT("co_IntCreateWindowEx %wZ\n", ClassName); - - if (hWndParent == HWND_MESSAGE) - { - /* - * native ole32.OleInitialize uses HWND_MESSAGE to create the - * message window (style: WS_POPUP|WS_DISABLED) - */ - ParentWindowHandle = IntGetMessageWindow(); - DPRINT("Parent is HWND_MESSAGE 0x%x\n", ParentWindowHandle); - } - else if (hWndParent) - { - if ((dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) - { //temp hack - PWINDOW_OBJECT Par = UserGetWindowObject(hWndParent), Root; - if (Par && (Root = UserGetAncestor(Par, GA_ROOT))) - OwnerWindowHandle = Root->hSelf; - } - else - ParentWindowHandle = hWndParent; - } - else if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) - { - SetLastWin32Error(ERROR_TLW_WITH_WSCHILD); - RETURN( (PWND)0); /* WS_CHILD needs a parent, but WS_POPUP doesn't */ - } - - if (ParentWindowHandle) - { - ParentWindow = UserGetWindowObject(ParentWindowHandle); - - if (ParentWindow) UserRefObjectCo(ParentWindow, &ParentRef); - } + /* Automatically add WS_EX_WINDOWEDGE */ + if ((Cs->dwExStyle & WS_EX_DLGMODALFRAME) || + ((!(Cs->dwExStyle & WS_EX_STATICEDGE)) && + (Cs->style & (WS_DLGFRAME | WS_THICKFRAME)))) + Cs->dwExStyle |= WS_EX_WINDOWEDGE; else - { - ParentWindow = NULL; - } - - /* FIXME: parent must belong to the current process */ - - /* Check the window station. */ - ti = GetW32ThreadInfo(); - if (ti == NULL || pti->rpdesk == NULL) - { - DPRINT1("Thread is not attached to a desktop! Cannot create window!\n"); - RETURN( (PWND)0); - } - - /* Check the class. */ - - DPRINT("Class %wZ\n", ClassName); - - ClassAtom = IntGetClassAtom(ClassName, - hInstance, - ti->ppi, - &Class, - &ClassLink); - - if (ClassAtom == (RTL_ATOM)0) - { - if (IS_ATOM(ClassName->Buffer)) - { - DPRINT1("Class 0x%p not found\n", (DWORD_PTR) ClassName->Buffer); - } - else - { - DPRINT1("Class \"%wZ\" not found\n", ClassName); - } - - SetLastWin32Error(ERROR_CANNOT_FIND_WND_CLASS); - RETURN((PWND)0); - } - DPRINT("ClassAtom %x\n", ClassAtom); - Class = IntReferenceClass(Class, - ClassLink, - pti->rpdesk); - if (Class == NULL) - { - DPRINT1("Failed to reference window class!\n"); - RETURN(NULL); - } - - WinSta = pti->rpdesk->rpwinstaParent; - - //FIXME: Reference thread/desktop instead - ObReferenceObjectByPointer(WinSta, KernelMode, ExWindowStationObjectType, 0); - - /* Create the window object. */ + Cs->dwExStyle &= ~WS_EX_WINDOWEDGE; + + /* Is it a unicode window? */ + bUnicodeWindow =!(Cs->dwExStyle & WS_EX_SETANSICREATOR); + Cs->dwExStyle &= ~WS_EX_SETANSICREATOR; + + /* Allocate the new window */ Window = (PWINDOW_OBJECT) UserCreateObject( gHandleTable, pti->rpdesk, (PHANDLE)&hWnd, otWindow, sizeof(WINDOW_OBJECT)); - if (Window) - { - Window->Wnd = DesktopHeapAlloc(pti->rpdesk, - sizeof(WND) + Class->cbwndExtra); - if (!Window->Wnd) - goto AllocErr; - RtlZeroMemory(Window->Wnd, - sizeof(WND) + Class->cbwndExtra); - Window->Wnd->head.h = hWnd; - Wnd = Window->Wnd; - Wnd->fnid = 0; - - Wnd->head.pti = ti; - Wnd->head.rpdesk = pti->rpdesk; - Wnd->hWndLastActive = hWnd; - Wnd->state2 |= WNDS2_WIN40COMPAT; - } + + Wnd = DesktopHeapAlloc(pti->rpdesk, sizeof(WND) + Class->cbwndExtra); + + if(!Window || !Wnd) + { + goto AllocError; + } + + RtlZeroMemory(Wnd, sizeof(WND) + Class->cbwndExtra); DPRINT("Created object with handle %X\n", hWnd); - if (!Window) - { -AllocErr: - ObDereferenceObject(WinSta); - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - RETURN( (PWND)0); - } - - UserRefObjectCo(Window, &Ref); - - ObDereferenceObject(WinSta); if (NULL == pti->rpdesk->DesktopWindow) { @@ -1852,38 +1733,43 @@ /* * Fill out the structure describing it. */ - Window->pti = ti; + Window->Wnd = Wnd; + Window->pti = pti; + Window->hSelf = hWnd; + Window->spwndParent = ParentWindow; + Window->hOwner = OwnerWindow ? OwnerWindow->hSelf : NULL; + + Wnd->head.h = hWnd; + Wnd->head.pti = pti; + Wnd->head.rpdesk = pti->rpdesk; + Wnd->fnid = 0; + Wnd->hWndLastActive = hWnd; + Wnd->state2 |= WNDS2_WIN40COMPAT; Wnd->pcls = Class; - Class = NULL; - - Window->SystemMenu = (HMENU)0; - Wnd->IDMenu = 0; - Wnd->hModule = hInstance; - Window->hSelf = hWnd; + Wnd->hModule = Cs->hInstance; + Wnd->style = Cs->style & ~WS_VISIBLE; + Wnd->ExStyle = Cs->dwExStyle; + Wnd->rcWindow.left = Cs->x; + Wnd->rcWindow.top = Cs->y; + Wnd->rcWindow.right = Cs->x + Cs->cx; + Wnd->rcWindow.bottom = Cs->y + Cs->cy; + Wnd->cbwndExtra = Wnd->pcls->cbwndExtra; + Wnd->spwndOwner = OwnerWindow ? OwnerWindow->Wnd : NULL; + Wnd->spwndParent = ParentWindow ? ParentWindow->Wnd : NULL; + + if (Wnd->style & WS_CHILD && ParentWindow) + { + RECTL_vOffsetRect(&(Wnd->rcWindow), ParentWindow->Wnd->rcClient.left, + ParentWindow->Wnd->rcClient.top); + } + Wnd->rcClient = Wnd->rcWindow; IntReferenceMessageQueue(Window->pti->MessageQueue); - Window->spwndParent = ParentWindow; - Wnd->spwndParent = ParentWindow ? ParentWindow->Wnd : NULL; - if (Wnd->spwndParent != NULL && hWndParent != 0) + if (Wnd->spwndParent != NULL && Cs->hwndParent != 0) { Wnd->HideFocus = Wnd->spwndParent->HideFocus; Wnd->HideAccel = Wnd->spwndParent->HideAccel; } - - if((OwnerWindow = UserGetWindowObject(OwnerWindowHandle))) - { - Window->hOwner = OwnerWindowHandle; - Wnd->spwndOwner = OwnerWindow->Wnd; - HasOwner = TRUE; - } - else - { - Window->hOwner = NULL; - Wnd->spwndOwner = NULL; - HasOwner = FALSE; - } - - Wnd->dwUserData = 0; if (Wnd->pcls->CSF_flags & CSF_SERVERSIDEPROC) Wnd->state |= WNDS_SERVERSIDEWINDOWPROC; @@ -1929,15 +1815,15 @@ WndProc, unless the following overriding conditions occur: */ if ( !bUnicodeWindow && - ( ClassAtom == gpsi->atomSysClass[ICLS_BUTTON] || - ClassAtom == gpsi->atomSysClass[ICLS_COMBOBOX] || - ClassAtom == gpsi->atomSysClass[ICLS_COMBOLBOX] || - ClassAtom == gpsi->atomSysClass[ICLS_DIALOG] || - ClassAtom == gpsi->atomSysClass[ICLS_EDIT] || - ClassAtom == gpsi->atomSysClass[ICLS_IME] || - ClassAtom == gpsi->atomSysClass[ICLS_LISTBOX] || - ClassAtom == gpsi->atomSysClass[ICLS_MDICLIENT] || - ClassAtom == gpsi->atomSysClass[ICLS_STATIC] ) ) + ( Class->atomClassName == gpsi->atomSysClass[ICLS_BUTTON] || + Class->atomClassName == gpsi->atomSysClass[ICLS_COMBOBOX] || + Class->atomClassName == gpsi->atomSysClass[ICLS_COMBOLBOX] || + Class->atomClassName == gpsi->atomSysClass[ICLS_DIALOG] || + Class->atomClassName == gpsi->atomSysClass[ICLS_EDIT] || + Class->atomClassName == gpsi->atomSysClass[ICLS_IME] || + Class->atomClassName == gpsi->atomSysClass[ICLS_LISTBOX] || + Class->atomClassName == gpsi->atomSysClass[ICLS_MDICLIENT] || + Class->atomClassName == gpsi->atomSysClass[ICLS_STATIC] ) ) { // Override Class and set the window Ansi WndProc. Wnd->state |= WNDS_ANSIWINDOWPROC; Wnd->Unicode = FALSE; @@ -1949,74 +1835,61 @@ } } - Window->spwndChild = NULL; - Window->spwndPrev = NULL; - Window->spwndNext = NULL; - - Wnd->spwndNext = NULL; - Wnd->spwndPrev = NULL; - Wnd->spwndChild = NULL; - - Wnd->cbwndExtra = Wnd->pcls->cbwndExtra; + /* BugBoy Comments: if the window being created is a edit control, ATOM 0xCxxx, + then my testing shows that windows (2k and XP) creates a CallProc for it immediately + Dont understand why it does this. */ + if (Class->atomClassName == gpsi->atomSysClass[ICLS_EDIT]) + { + PCALLPROCDATA CallProc; + //CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, bUnicodeWindow, Wnd->ti->ppi); + CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, Wnd->Unicode , Wnd->head.pti->ppi); + + if (!CallProc) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + DPRINT1("Warning: Unable to create CallProc for edit control. Control may not operate correctly! hwnd %x\n",hWnd); + } + else + { + UserAddCallProcToClass(Wnd->pcls, CallProc); + } + } InitializeListHead(&Wnd->PropListHead); - if ( NULL != WindowName->Buffer && WindowName->Length > 0 ) + if ( WindowName->Buffer != NULL && WindowName->Length > 0 ) { Wnd->strName.Buffer = DesktopHeapAlloc(Wnd->head.rpdesk, - WindowName->Length + sizeof(UNICODE_NULL)); + WindowName->Length + sizeof(UNICODE_NULL)); if (Wnd->strName.Buffer == NULL) { - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - RETURN( (PWND)0); - } - + goto AllocError; + } + + RtlCopyMemory(Wnd->strName.Buffer, WindowName->Buffer, WindowName->Length); Wnd->strName.Buffer[WindowName->Length / sizeof(WCHAR)] = L'\0'; - _SEH2_TRY - { - RtlCopyMemory(Wnd->strName.Buffer, - WindowName->Buffer, - WindowName->Length); - Wnd->strName.Length = WindowName->Length; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - WindowName->Length = 0; - Wnd->strName.Buffer[0] = L'\0'; - } - _SEH2_END; - } - - /* - * This has been tested for WS_CHILD | WS_VISIBLE. It has not been - * tested for WS_POPUP - */ - if ((dwExStyle & WS_EX_DLGMODALFRAME) || - ((!(dwExStyle & WS_EX_STATICEDGE)) && - (dwStyle & (WS_DLGFRAME | WS_THICKFRAME)))) - dwExStyle |= WS_EX_WINDOWEDGE; - else - dwExStyle &= ~WS_EX_WINDOWEDGE; - - dwExStyle &= ~WS_EX_SETANSICREATOR; - - Wnd->style = dwStyle & ~WS_VISIBLE; + Wnd->strName.Length = WindowName->Length; + } /* Correct the window style. */ if ((Wnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) { Wnd->style |= WS_CLIPSIBLINGS; - DPRINT("3: Style is now %lx\n", dwStyle); if (!(Wnd->style & WS_POPUP)) { Wnd->style |= WS_CAPTION; Window->state |= WINDOWOBJECT_NEED_SIZE; - DPRINT("4: Style is now %lx\n", dwStyle); - } - } + } + } + + if ((Wnd->ExStyle & WS_EX_DLGMODALFRAME) || + (Wnd->style & (WS_DLGFRAME | WS_THICKFRAME))) + Wnd->ExStyle |= WS_EX_WINDOWEDGE; + else + Wnd->ExStyle &= ~WS_EX_WINDOWEDGE; /* create system menu */ - if((dwStyle & WS_SYSMENU) )//&& (dwStyle & WS_CAPTION) == WS_CAPTION) + if((Cs->style & WS_SYSMENU) )//&& (dwStyle & WS_CAPTION) == WS_CAPTION) { SystemMenu = IntGetSystemMenu(Window, TRUE, TRUE); if(SystemMenu) @@ -2027,13 +1900,15 @@ } /* Set the window menu */ - if ((dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) - { - if (hMenu) - IntSetMenu(Window, hMenu, &MenuChanged); + if ((Cs->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) + { + if (Cs->hMenu) + IntSetMenu(Window, Cs->hMenu, &MenuChanged); else if (Wnd->pcls->lpszMenuName) // Take it from the parent. { UNICODE_STRING MenuName; + HMENU hMenu; + if (IS_INTRESOURCE(Wnd->pcls->lpszMenuName)) { MenuName.Length = 0; @@ -2049,7 +1924,7 @@ } } else // Not a child - Wnd->IDMenu = (UINT) hMenu; + Wnd->IDMenu = (UINT) Cs->hMenu; /* Insert the window into the thread's window list. */ InsertTailList (&pti->WindowListHead, &Window->ThreadListEntry); @@ -2064,163 +1939,138 @@ DceAllocDCE(Window, DCE_WINDOW_DC); } - Pos.x = x; - Pos.y = y; - Size.cx = nWidth; - Size.cy = nHeight; - - Wnd->ExStyle = dwExStyle; - - /* call hook */ - Cs.lpCreateParams = lpParam; - Cs.hInstance = hInstance; - Cs.hMenu = hMenu; - Cs.hwndParent = hWndParent; //Pass the original Parent handle! - Cs.cx = Size.cx; - Cs.cy = Size.cy; - Cs.x = Pos.x; - Cs.y = Pos.y; - Cs.style = Wnd->style; -// Cs.lpszName = (LPCWSTR) WindowName->Buffer; -// Cs.lpszClass = (LPCWSTR) ClassName->Buffer; - Cs.lpszName = (LPCWSTR) WindowName; - Cs.lpszClass = (LPCWSTR) ClassName; - Cs.dwExStyle = dwExStyle; - CbtCreate.lpcs = &Cs; + return Window; + +AllocError: + + if(Window) + UserDereferenceObject(Window); + + if(Wnd) + DesktopHeapFree(Wnd->head.rpdesk, Wnd); + + SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); + return NULL; +} + +/* + * @implemented + */ +PWND FASTCALL +co_UserCreateWindowEx(CREATESTRUCTW* Cs, + PUNICODE_STRING ClassName, + PLARGE_STRING WindowName) +{ + PWINDOW_OBJECT Window = NULL, ParentWindow = NULL, OwnerWindow; + HWND hWnd, hWndParent, hWndOwner; + DWORD dwStyle; + PWINSTATION_OBJECT WinSta; + PWND Wnd = NULL; + PCLS Class = NULL; + SIZE Size; + POINT MaxPos; + CBT_CREATEWNDW CbtCreate; + LRESULT Result; + USER_REFERENCE_ENTRY ParentRef, Ref; + PTHREADINFO pti; + DWORD dwShowMode = SW_SHOW; + DECLARE_RETURN(PWND); + + /* Get the current window station and reference it */ + pti = GetW32ThreadInfo(); + if (pti == NULL || pti->rpdesk == NULL) + { + DPRINT1("Thread is not attached to a desktop! Cannot create window!\n"); + return NULL; //There is nothing to cleanup + } + WinSta = pti->rpdesk->rpwinstaParent; + ObReferenceObjectByPointer(WinSta, KernelMode, ExWindowStationObjectType, 0); + + /* Get the class and reference it*/ + Class = IntGetAndReferenceClass(ClassName, Cs->hInstance); + if(!Class) + { + DPRINT1("Failed to find class %wZ\n", ClassName); + RETURN(NULL); + } + + /* Now find the parent and the owner window */ + hWndParent = IntGetDesktopWindow(); + hWndOwner = NULL; + + if (Cs->hwndParent == HWND_MESSAGE) + { + Cs->hwndParent = hWndParent = IntGetMessageWindow(); + } + else if (Cs->hwndParent) + { + if ((Cs->style & (WS_CHILD|WS_POPUP)) != WS_CHILD) + hWndOwner = Cs->hwndParent; + else + hWndParent = Cs->hwndParent; + } + else if ((Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) + { + DPRINT1("Cannot create a child window without a parrent!\n"); + SetLastWin32Error(ERROR_TLW_WITH_WSCHILD); + RETURN(NULL); /* WS_CHILD needs a parent, but WS_POPUP doesn't */ + } + + ParentWindow = hWndParent ? UserGetWindowObject(hWndParent): NULL; + OwnerWindow = hWndOwner ? UserGetWindowObject(hWndOwner): NULL; + + /* FIXME: is this correct?*/ + if(OwnerWindow) + OwnerWindow = UserGetAncestor(OwnerWindow, GA_ROOT); + + /* Fix the position and the size of the window */ + if (ParentWindow) + { + UserRefObjectCo(ParentWindow, &ParentRef); + IntFixWindowCoordinates(Cs, ParentWindow, &dwShowMode); + } + + /* Allocate and initialize the new window */ + Window = IntCreateWindow(Cs, + WindowName, + Class, + ParentWindow, + OwnerWindow); + if(!Window) + { + DPRINT1("IntCreateWindow failed!\n"); + RETURN(0); + } + + Wnd = Window->Wnd; + hWnd = Window->hSelf; + + UserRefObjectCo(Window, &Ref); + ObDereferenceObject(WinSta); + + /* Call the WH_CBT hook */ + dwStyle = Cs->style; + Cs->style = Wnd->style; /* HCBT_CREATEWND needs the real window style */ + CbtCreate.lpcs = Cs; CbtCreate.hwndInsertAfter = HWND_TOP; if (ISITHOOKED(WH_CBT)) { if (co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) &CbtCreate)) { - /* FIXME - Delete window object and remove it from the thread windows list */ - /* FIXME - delete allocated DCE */ - DPRINT1("CBT-hook returned !0\n"); + DPRINT1("HCBT_CREATEWND hook failed!\n"); RETURN( (PWND) NULL); } } - x = Cs.x; - y = Cs.y; - nWidth = Cs.cx; - nHeight = Cs.cy; - - Cs.style = dwStyle; -// FIXME: Need to set the Z order in the window link list if the hook callback changed it! -// hwndInsertAfter = CbtCreate.hwndInsertAfter; - - /* default positioning for overlapped windows */ - if(!(Wnd->style & (WS_POPUP | WS_CHILD))) - { - RECTL rc, WorkArea; - PRTL_USER_PROCESS_PARAMETERS ProcessParams; - BOOL CalculatedDefPosSize = FALSE; - - UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); - - rc = WorkArea; - ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters; - - if(x == CW_USEDEFAULT || x == CW_USEDEFAULT16) - { - CalculatedDefPosSize = IntCalcDefPosSize(ParentWindow, &rc, TRUE); - - if(ProcessParams->WindowFlags & STARTF_USEPOSITION) - { - ProcessParams->WindowFlags &= ~STARTF_USEPOSITION; - Pos.x = WorkArea.left + ProcessParams->StartingX; - Pos.y = WorkArea.top + ProcessParams->StartingY; - } - else - { - Pos.x = rc.left; - Pos.y = rc.top; - } - -/* - According to wine, the ShowMode is set to y if x == CW_USEDEFAULT(16) and - y is something else. and Quote! - */ - -/* Never believe Microsoft's documentation... CreateWindowEx doc says - * that if an overlapped window is created with WS_VISIBLE style bit - * set and the x parameter is set to CW_USEDEFAULT, the system ignores - * the y parameter. However, disassembling NT implementation (WIN32K.SYS) - * reveals that - * - * 1) not only it checks for CW_USEDEFAULT but also for CW_USEDEFAULT16 - * 2) it does not ignore the y parameter as the docs claim; instead, it - * uses it as second parameter to ShowWindow() unless y is either - * CW_USEDEFAULT or CW_USEDEFAULT16. - * - * The fact that we didn't do 2) caused bogus windows pop up when wine - * was running apps that were using this obscure feature. Example - - * calc.exe that comes with Win98 (only Win98, it's different from - * the one that comes with Win95 and NT) - */ - if(y != CW_USEDEFAULT && y != CW_USEDEFAULT16) - { - dwShowMode = y; - } - } - if(nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16) - { - if(!CalculatedDefPosSize) - { - IntCalcDefPosSize(ParentWindow, &rc, FALSE); - } - if(ProcessParams->WindowFlags & STARTF_USESIZE) - { - ProcessParams->WindowFlags &= ~STARTF_USESIZE; - Size.cx = ProcessParams->CountX; - Size.cy = ProcessParams->CountY; - } - else - { - Size.cx = rc.right - rc.left; - Size.cy = rc.bottom - rc.top; - } - - /* move the window if necessary */ - if(Pos.x > rc.left) - Pos.x = max(rc.left, 0); - if(Pos.y > rc.top) - Pos.y = max(rc.top, 0); - } - } - else - { - /* if CW_USEDEFAULT(16) is set for non-overlapped windows, both values are set to zero) */ - if(x == CW_USEDEFAULT || x == CW_USEDEFAULT16) - { - Pos.x = 0; - Pos.y = 0; - } - if(nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16) - { - Size.cx = 0; - Size.cy = 0; - } - } - - /* Initialize the window dimensions. */ - Wnd->rcWindow.left = Pos.x; - Wnd->rcWindow.top = Pos.y; - Wnd->rcWindow.right = Pos.x + Size.cx; - Wnd->rcWindow.bottom = Pos.y + Size.cy; - if (0 != (Wnd->style & WS_CHILD) && ParentWindow) - { - RECTL_vOffsetRect(&(Wnd->rcWindow), ParentWindow->Wnd->rcClient.left, - ParentWindow->Wnd->rcClient.top); - } - Wnd->rcClient = Wnd->rcWindow; - - /* - * Get the size and position of the window. - */ + Cs->style = dwStyle; /* NCCREATE and WM_NCCALCSIZE need the original values*/ + + /* Send the WM_GETMINMAXINFO message*/ + Size.cx = Cs->cx; + Size.cy = Cs->cy; + if ((dwStyle & WS_THICKFRAME) || !(dwStyle & (WS_POPUP | WS_CHILD))) { POINT MaxSize, MaxPos, MinTrack, MaxTrack; - /* WinPosGetMinMaxInfo sends the WM_GETMINMAXINFO message */ co_WinPosGetMinMaxInfo(Window, &MaxSize, &MaxPos, &MinTrack, &MaxTrack); if (Size.cx > MaxTrack.x) Size.cx = MaxTrack.x; if (Size.cy > MaxTrack.y) Size.cy = MaxTrack.y; @@ -2228,47 +2078,20 @@ if (Size.cy < MinTrack.y) Size.cy = MinTrack.y; } - Wnd->rcWindow.left = Pos.x; - Wnd->rcWindow.top = Pos.y; - Wnd->rcWindow.right = Pos.x + Size.cx; - Wnd->rcWindow.bottom = Pos.y + Size.cy; + Wnd->rcWindow.left = Cs->x; + Wnd->rcWindow.top = Cs->y; + Wnd->rcWindow.right = Cs->x + Size.cx; + Wnd->rcWindow.bottom = Cs->y + Size.cy; if (0 != (Wnd->style & WS_CHILD) && ParentWindow) { - RECTL_vOffsetRect(&(Wnd->rcWindow), ParentWindow->Wnd->rcClient.left, - ParentWindow->Wnd->rcClient.top); + RECTL_vOffsetRect(&Wnd->rcWindow, + ParentWindow->Wnd->rcClient.left, + ParentWindow->Wnd->rcClient.top); } Wnd->rcClient = Wnd->rcWindow; - /* FIXME: Initialize the window menu. */ - - /* Send a NCCREATE message. */ - DPRINT("[win32k.window] IntCreateWindowEx style %d, exstyle %d, parent %d\n", Cs.style, Cs.dwExStyle, Cs.hwndParent); - DPRINT("IntCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, Size.cx, Size.cy); - DPRINT("IntCreateWindowEx(): About to send NCCREATE message.\n"); - Result = co_IntSendMessage(Window->hSelf, WM_NCCREATE, 0, (LPARAM) &Cs); - if (!Result) - { - /* FIXME: Cleanup. */ - DPRINT1("IntCreateWindowEx(): NCCREATE message failed. No cleanup performed!\n"); - RETURN((PWND)0); - } - - /* Calculate the non-client size. */ - MaxPos.x = Window->Wnd->rcWindow.left; - MaxPos.y = Window->Wnd->rcWindow.top; - - - DPRINT("IntCreateWindowEx(): About to get non-client size.\n"); - /* WinPosGetNonClientSize SENDS THE WM_NCCALCSIZE message */ - Result = co_WinPosGetNonClientSize(Window, - &Window->Wnd->rcWindow, - &Window->Wnd->rcClient); - - RECTL_vOffsetRect(&Window->Wnd->rcWindow, - MaxPos.x - Window->Wnd->rcWindow.left, - MaxPos.y - Window->Wnd->rcWindow.top); - - + + /* Link the window*/ if (NULL != ParentWindow) { /* link the window into the parent's child list */ @@ -2291,7 +2114,7 @@ { /* link window as top sibling (but after topmost siblings) */ PWINDOW_OBJECT InsertAfter, Sibling; - if (!(dwExStyle & WS_EX_TOPMOST)) + if (!(Cs->dwExStyle & WS_EX_TOPMOST)) { InsertAfter = NULL; Sibling = ParentWindow->spwndChild; @@ -2309,19 +2132,35 @@ IntLinkWindow(Window, ParentWindow, InsertAfter /* prev sibling */); } } + + /* Send the NCCREATE message */ + Result = co_IntSendMessage(Window->hSelf, WM_NCCREATE, 0, (LPARAM) Cs); + if (!Result) + { + DPRINT1("co_UserCreateWindowEx(): NCCREATE message failed\n"); + RETURN((PWND)0); + } + + /* Send the WM_NCCALCSIZE message */ + MaxPos.x = Window->Wnd->rcWindow.left; + MaxPos.y = Window->Wnd->rcWindow.top; + + Result = co_WinPosGetNonClientSize(Window, &Wnd->rcWindow, &Wnd->rcClient); + + RECTL_vOffsetRect(&Wnd->rcWindow, MaxPos.x - Wnd->rcWindow.left, + MaxPos.y - Wnd->rcWindow.top); + /* Send the WM_CREATE message. */ - DPRINT("IntCreateWindowEx(): about to send CREATE message.\n"); - Result = co_IntSendMessage(Window->hSelf, WM_CREATE, 0, (LPARAM) &Cs); - + Result = co_IntSendMessage(Window->hSelf, WM_CREATE, 0, (LPARAM) Cs); if (Result == (LRESULT)-1) { - /* FIXME: Cleanup. */ - DPRINT1("IntCreateWindowEx(): send CREATE message failed. No cleanup performed!\n"); + DPRINT1("co_UserCreateWindowEx(): WM_CREATE message failed\n"); IntUnlinkWindow(Window); RETURN((PWND)0); } + /* Send the EVENT_OBJECT_CREATE event*/ IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window->Wnd, OBJID_WINDOW, 0); /* By setting the flag below it can be examined to determine if the window @@ -2329,43 +2168,10 @@ from here the function has to succeed. */ Window->Wnd->state2 |= WNDS2_WMCREATEMSGPROCESSED; - /* Send move and size messages. */ + /* Send the WM_SIZE and WM_MOVE messages. */ if (!(Window->state & WINDOWOBJECT_NEED_SIZE)) { - LONG lParam; - - DPRINT("IntCreateWindow(): About to send WM_SIZE\n"); - - if ((Window->Wnd->rcClient.right - Window->Wnd->rcClient.left) < 0 || - (Window->Wnd->rcClient.bottom - Window->Wnd->rcClient.top) < 0) - { - DPRINT("Sending bogus WM_SIZE\n"); - } - - lParam = MAKE_LONG(Window->Wnd->rcClient.right - - Window->Wnd->rcClient.left, - Window->Wnd->rcClient.bottom - - Window->Wnd->rcClient.top); - co_IntSendMessage(Window->hSelf, WM_SIZE, SIZE_RESTORED, - lParam); - - DPRINT("IntCreateWindow(): About to send WM_MOVE\n"); - - if (0 != (Wnd->style & WS_CHILD) && ParentWindow) - { - lParam = MAKE_LONG(Wnd->rcClient.left - ParentWindow->Wnd->rcClient.left, - Wnd->rcClient.top - ParentWindow->Wnd->rcClient.top); - } - else - { - lParam = MAKE_LONG(Wnd->rcClient.left, - Wnd->rcClient.top); - } - - co_IntSendMessage(Window->hSelf, WM_MOVE, 0, lParam); - - /* Call WNDOBJ change procs */ - IntEngWindowChanged(Window, WOC_RGN_CLIENT); + co_WinPosSendSizeMove(Window); } /* Show or maybe minimize or maximize the window. */ @@ -2374,8 +2180,7 @@ RECTL NewPos; UINT16 SwFlag; - SwFlag = (Wnd->style & WS_MINIMIZE) ? SW_MINIMIZE : - SW_MAXIMIZE; + SwFlag = (Wnd->style & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE; co_WinPosMinMaximize(Window, SwFlag, &NewPos); @@ -2383,31 +2188,24 @@ SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED : SWP_NOZORDER | SWP_FRAMECHANGED; - DPRINT("IntCreateWindow(): About to minimize/maximize\n"); - DPRINT("%d,%d %dx%d\n", NewPos.left, NewPos.top, NewPos.right, NewPos.bottom); co_WinPosSetWindowPos(Window, 0, NewPos.left, NewPos.top, NewPos.right, NewPos.bottom, SwFlag); } - /* Notify the parent window of a new child. */ + /* Send the WM_PARENTNOTIFY message */ if ((Wnd->style & WS_CHILD) && (!(Wnd->ExStyle & WS_EX_NOPARENTNOTIFY)) && ParentWindow) { - DPRINT("IntCreateWindow(): About to notify parent\n"); co_IntSendMessage(ParentWindow->hSelf, WM_PARENTNOTIFY, MAKEWPARAM(WM_CREATE, Wnd->IDMenu), (LPARAM)Window->hSelf); } - if ((!hWndParent) && (!HasOwner)) - { - DPRINT("Sending CREATED notify\n"); + /* Notify the shell that a new window was created */ + if ((!hWndParent) && (!hWndOwner)) + { co_IntShellHookNotify(HSHELL_WINDOWCREATED, (LPARAM)hWnd); - } - else - { - DPRINT("Not sending CREATED notify, %x %d\n", ParentWindow, HasOwner); } /* Initialize and show the window's scrollbars */ @@ -2420,14 +2218,14 @@ co_UserShowScrollBar(Window, SB_HORZ, TRUE); } - if (dwStyle & WS_VISIBLE) + /* Show the new window */ + if (Cs->style & WS_VISIBLE) { if (Wnd->style & WS_MAXIMIZE) dwShowMode = SW_SHOW; else if (Wnd->style & WS_MINIMIZE) dwShowMode = SW_SHOWMINIMIZED; - DPRINT("IntCreateWindow(): About to show window\n"); co_WinPosShowWindow(Window, dwShowMode); if (Wnd->ExStyle & WS_EX_MDICHILD) @@ -2438,49 +2236,26 @@ } } - /* BugBoy Comments: if the window being created is a edit control, ATOM 0xCxxx, - then my testing shows that windows (2k and XP) creates a CallProc for it immediately - Dont understand why it does this. */ - if (ClassAtom == gpsi->atomSysClass[ICLS_EDIT]) - { - PCALLPROCDATA CallProc; - //CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, bUnicodeWindow, Wnd->ti->ppi); - CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, Wnd->Unicode , Wnd->head.pti->ppi); - - if (!CallProc) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - DPRINT1("Warning: Unable to create CallProc for edit control. Control may not operate correctly! hwnd %x\n",hWnd); - } - else - { - UserAddCallProcToClass(Wnd->pcls, CallProc); - } - } - - DPRINT("IntCreateWindow(): = %X\n", hWnd); - DPRINT("WindowObject->SystemMenu = 0x%x\n", Window->SystemMenu); + DPRINT("co_UserCreateWindowEx(): Created window %X\n", hWnd); RETURN( Wnd); CLEANUP: - if (!_ret_ && Window && Window->Wnd && ti) - co_UserDestroyWindow(Window); -// UserFreeWindowInfo(ti, Window); + if (!_ret_) + { + /* If the window was created, the class will be dereferenced by co_UserDestroyWindow */ + if (Window) + co_UserDestroyWindow(Window); + else + IntDereferenceClass(Class, pti->pDeskInfo, pti->ppi); + } + if (Window) { UserDerefObjectCo(Window); UserDereferenceObject(Window); } if (ParentWindow) UserDerefObjectCo(ParentWindow); - if (!_ret_ && ti != NULL) - { - if (Class != NULL) - { - IntDereferenceClass(Class, - ti->pDeskInfo, - ti->ppi); - } - } + END_CLEANUP; } @@ -2564,11 +2339,9 @@ LARGE_STRING lstrWindowName; LARGE_STRING lstrClassName; UNICODE_STRING ustrClassName; + CREATESTRUCTW Cs; HWND hwnd = NULL; PWND pwnd; - - DPRINT("Enter NtUserCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, nWidth, nHeight); - UserEnterExclusive(); lstrWindowName.Buffer = NULL; lstrClassName.Buffer = NULL; @@ -2580,8 +2353,9 @@ Status = ProbeAndCaptureLargeString(&lstrWindowName, plstrWindowName); if (!NT_SUCCESS(Status)) { + DPRINT1("NtUserCreateWindowEx: failed to capture plstrWindowName\n"); SetLastNtError(Status); - goto leave; + return NULL; } plstrWindowName = &lstrWindowName; } @@ -2600,6 +2374,7 @@ Status = ProbeAndCaptureLargeString(&lstrClassName, plstrClassName); if (!NT_SUCCESS(Status)) { + DPRINT1("NtUserCreateWindowEx: failed to capture plstrClassName\n"); /* Set last error, cleanup and return */ SetLastNtError(Status); goto cleanup; @@ -2611,23 +2386,35 @@ ustrClassName.MaximumLength = lstrClassName.MaximumLength; } + /* Fill the CREATESTRUCTW */ + /* we will keep here the original parameters */ + Cs.style = dwStyle; + Cs.lpCreateParams = lpParam; + Cs.hInstance = hInstance; + Cs.hMenu = hMenu; + Cs.hwndParent = hWndParent; + Cs.cx = nWidth; + Cs.cy = nHeight; + Cs.x = x; + Cs.y = y; +// Cs.lpszName = (LPCWSTR) WindowName->Buffer; +// Cs.lpszClass = (LPCWSTR) ClassName->Buffer; + Cs.lpszName = (LPCWSTR) plstrWindowName; + Cs.lpszClass = (LPCWSTR) &ustrClassName; + Cs.dwExStyle = dwExStyle; + + UserEnterExclusive(); + /* Call the internal function */ - pwnd = co_IntCreateWindowEx(dwExStyle, - &ustrClassName, - plstrWindowName, - dwStyle, - x, - y, - nWidth, - nHeight, - hWndParent, - hMenu, - hInstance, - lpParam, - SW_SHOW, - !(dwExStyle & WS_EX_SETANSICREATOR)); - + pwnd = co_UserCreateWindowEx(&Cs, &ustrClassName, plstrWindowName); + + if(!pwnd) + { + DPRINT1("co_UserCreateWindowEx failed!\n"); + } hwnd = pwnd ? UserHMGetHandle(pwnd) : NULL; + + UserLeave(); cleanup: if (lstrWindowName.Buffer) @@ -2638,10 +2425,6 @@ { ExFreePoolWithTag(lstrClassName.Buffer, TAG_STRING); } - -leave: - DPRINT("Leave NtUserCreateWindowEx, hwnd=%i\n", hwnd); - UserLeave(); return hwnd; } @@ -2957,10 +2740,10 @@ (Child->Wnd->strName.Length < 0xFFFF && !RtlCompareUnicodeString(WindowName, &CurrentWindowName, TRUE))) { - Ret = Child->hSelf; - break; - } + Ret = Child->hSelf; + break; } + } } ExFreePool(List); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Mon May 31 19:58:05 2010 @@ -1463,6 +1463,33 @@ return Result; } +void FASTCALL +co_WinPosSendSizeMove(PWINDOW_OBJECT Window) +{ + WPARAM wParam = SIZE_RESTORED; + PWND Wnd = Window->Wnd; + + Window->state &= ~WINDOWOBJECT_NEED_SIZE; + if (Wnd->style & WS_MAXIMIZE) + { + wParam = SIZE_MAXIMIZED; + } + else if (Wnd->style & WS_MINIMIZE) + { + wParam = SIZE_MINIMIZED; + } + + co_IntSendMessageNoWait(Window->hSelf, WM_SIZE, wParam, + MAKELONG(Wnd->rcClient.right - + Wnd->rcClient.left, + Wnd->rcClient.bottom - + Wnd->rcClient.top)); + co_IntSendMessageNoWait(Window->hSelf, WM_MOVE, 0, + MAKELONG(Wnd->rcClient.left, + Wnd->rcClient.top)); + IntEngWindowChanged(Window, WOC_RGN_CLIENT); +} + BOOLEAN FASTCALL co_WinPosShowWindow(PWINDOW_OBJECT Window, INT Cmd) { @@ -1621,28 +1648,7 @@ if ((Window->state & WINDOWOBJECT_NEED_SIZE) && !(Window->state & WINDOWSTATUS_DESTROYING)) { - WPARAM wParam = SIZE_RESTORED; - - Window->state &= ~WINDOWOBJECT_NEED_SIZE; - if (Wnd->style & WS_MAXIMIZE) - { - wParam = SIZE_MAXIMIZED; - } - else if (Wnd->style & WS_MINIMIZE) - { - wParam = SIZE_MINIMIZED; - } - - co_IntSendMessageNoWait(Window->hSelf, WM_SIZE, wParam, - MAKELONG(Wnd->rcClient.right - - Wnd->rcClient.left, - Wnd->rcClient.bottom - - Wnd->rcClient.top)); - co_IntSendMessageNoWait(Window->hSelf, WM_MOVE, 0, - MAKELONG(Wnd->rcClient.left, - Wnd->rcClient.top)); - IntEngWindowChanged(Window, WOC_RGN_CLIENT); - + co_WinPosSendSizeMove(Window); } /* Activate the window if activation is not requested and the window is not minimized */

14 years, 7 months

[tkreuzer] 47499: [MMENT4] Fix warning about uninitialized variable

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 17:27:14 2010 New Revision: 47499 URL: http://svn.reactos.org/svn/reactos?rev=47499&view=rev Log: [MMENT4] Fix warning about uninitialized variable Modified: trunk/reactos/lib/drivers/sound/mment4/control.c Modified: trunk/reactos/lib/drivers/sound/mment4/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] Mon May 31 17:27:14 2010 @@ -117,6 +117,7 @@ { /* FIXME - need to support AUX and mixer devices */ SND_ASSERT( FALSE ); + IoCtl = 0; } /* Get the capabilities information from the driver */

14 years, 7 months

[tkreuzer] 47498: [PSDK] Fix braces around initializers for GUIDs Patch by Love Nystrom See issue #5336 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 17:10:25 2010 New Revision: 47498 URL: http://svn.reactos.org/svn/reactos?rev=47498&view=rev Log: [PSDK] Fix braces around initializers for GUIDs Patch by Love Nystrom See issue #5336 for more details. Modified: trunk/reactos/include/dxsdk/ksguid.h trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/dxsdk/ksguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ksguid.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/ksguid.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/ksguid.h [iso-8859-1] Mon May 31 17:10:25 2010 @@ -6,7 +6,7 @@ #endif #if !defined( DEFINE_WAVEFORMATEX_GUID ) - #define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 + #define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } #endif #if defined( DEFINE_GUIDEX ) Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4749… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon May 31 17:10:25 2010 @@ -166,77 +166,77 @@ */ #define STATIC_KSCATEGORY_BRIDGE \ - 0x085AFF00L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x085AFF00L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("085AFF00-62CE-11CF-A5D6-28DB04C10000", KSCATEGORY_BRIDGE); #define KSCATEGORY_BRIDGE DEFINE_GUIDNAMED(KSCATEGORY_BRIDGE) #define STATIC_KSCATEGORY_CAPTURE \ - 0x65E8773DL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("65E8773D-8F56-11D0-A3B9-00A0C9223196", KSCATEGORY_CAPTURE); #define KSCATEGORY_CAPTURE DEFINE_GUIDNAMED(KSCATEGORY_CAPTURE) #define STATIC_KSCATEGORY_RENDER \ - 0x65E8773EL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x65E8773EL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("65E8773E-8F56-11D0-A3B9-00A0C9223196", KSCATEGORY_RENDER); #define KSCATEGORY_RENDER DEFINE_GUIDNAMED(KSCATEGORY_RENDER) #define STATIC_KSCATEGORY_MIXER \ - 0xAD809C00L, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0xAD809C00L, 0x7B88, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("AD809C00-7B88-11D0-A5D6-28DB04C10000", KSCATEGORY_MIXER); #define KSCATEGORY_MIXER DEFINE_GUIDNAMED(KSCATEGORY_MIXER) #define STATIC_KSCATEGORY_SPLITTER \ - 0x0A4252A0L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x0A4252A0L, 0x7E70, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("0A4252A0-7E70-11D0-A5D6-28DB04C10000", KSCATEGORY_SPLITTER); #define KSCATEGORY_SPLITTER DEFINE_GUIDNAMED(KSCATEGORY_SPLITTER) #define STATIC_KSCATEGORY_DATACOMPRESSOR \ - 0x1E84C900L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x1E84C900L, 0x7E70, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("1E84C900-7E70-11D0-A5D6-28DB04C10000", KSCATEGORY_DATACOMPRESSOR); #define KSCATEGORY_DATACOMPRESSOR DEFINE_GUIDNAMED(KSCATEGORY_DATACOMPRESSOR) #define STATIC_KSCATEGORY_DATADECOMPRESSOR \ - 0x2721AE20L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x2721AE20L, 0x7E70, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("2721AE20-7E70-11D0-A5D6-28DB04C10000", KSCATEGORY_DATADECOMPRESSOR); #define KSCATEGORY_DATADECOMPRESSOR DEFINE_GUIDNAMED(KSCATEGORY_DATADECOMPRESSOR) #define STATIC_KSCATEGORY_DATATRANSFORM \ - 0x2EB07EA0L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x2EB07EA0L, 0x7E70, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("2EB07EA0-7E70-11D0-A5D6-28DB04C10000", KSCATEGORY_DATATRANSFORM); #define KSCATEGORY_DATATRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_DATATRANSFORM) #define STATIC_KSCATEGORY_COMMUNICATIONSTRANSFORM \ - 0xCF1DDA2CL, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0xCF1DDA2CL, 0x9743, 0x11D0, {0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("CF1DDA2C-9743-11D0-A3EE-00A0C9223196", KSCATEGORY_COMMUNICATIONSTRANSFORM); #define KSCATEGORY_COMMUNICATIONSTRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_COMMUNICATIONSTRANSFORM) #define STATIC_KSCATEGORY_INTERFACETRANSFORM \ - 0xCF1DDA2DL, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0xCF1DDA2DL, 0x9743, 0x11D0, {0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("CF1DDA2D-9743-11D0-A3EE-00A0C9223196", KSCATEGORY_INTERFACETRANSFORM); #define KSCATEGORY_INTERFACETRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_INTERFACETRANSFORM) #define STATIC_KSCATEGORY_MEDIUMTRANSFORM \ - 0xCF1DDA2EL, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0xCF1DDA2EL, 0x9743, 0x11D0, {0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("CF1DDA2E-9743-11D0-A3EE-00A0C9223196", KSCATEGORY_MEDIUMTRANSFORM); #define KSCATEGORY_MEDIUMTRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_MEDIUMTRANSFORM) #define STATIC_KSCATEGORY_FILESYSTEM \ - 0x760FED5EL, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x760FED5EL, 0x9357, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("760FED5E-9357-11D0-A3CC-00A0C9223196", KSCATEGORY_FILESYSTEM); #define KSCATEGORY_FILESYSTEM DEFINE_GUIDNAMED(KSCATEGORY_FILESYSTEM) #define STATIC_KSCATEGORY_CLOCK \ - 0x53172480L, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x53172480L, 0x4791, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("53172480-4791-11D0-A5D6-28DB04C10000", KSCATEGORY_CLOCK); #define KSCATEGORY_CLOCK DEFINE_GUIDNAMED(KSCATEGORY_CLOCK) #define STATIC_KSCATEGORY_PROXY \ - 0x97EBAACAL, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x97EBAACAL, 0x95BD, 0x11D0, {0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("97EBAACA-95BD-11D0-A3EA-00A0C9223196", KSCATEGORY_PROXY); #define KSCATEGORY_PROXY DEFINE_GUIDNAMED(KSCATEGORY_PROXY) #define STATIC_KSCATEGORY_QUALITY \ - 0x97EBAACBL, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x97EBAACBL, 0x95BD, 0x11D0, {0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("97EBAACB-95BD-11D0-A3EA-00A0C9223196", KSCATEGORY_QUALITY); #define KSCATEGORY_QUALITY DEFINE_GUIDNAMED(KSCATEGORY_QUALITY) @@ -308,7 +308,7 @@ } KSINTERFACE_STANDARD; #define STATIC_KSINTERFACESETID_FileIo \ - 0x8C6F932CL, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x8C6F932CL, 0xE771, 0x11D0, {0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("8C6F932C-E771-11D0-B8FF-00A0C9223196", KSINTERFACESETID_FileIo); #define KSINTERFACESETID_FileIo DEFINE_GUIDNAMED(KSINTERFACESETID_FileIo) @@ -337,7 +337,7 @@ */ #define STATIC_KSPROPSETID_Clock \ - 0xDF12A4C0L, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0xDF12A4C0L, 0xAC17, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("DF12A4C0-AC17-11CF-A5D6-28DB04C10000", KSPROPSETID_Clock); #define KSPROPSETID_Clock DEFINE_GUIDNAMED(KSPROPSETID_Clock) @@ -355,7 +355,7 @@ } KSPROPERTY_CLOCK; #define STATIC_KSEVENTSETID_Clock \ - 0x364D8E20L, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x364D8E20L, 0x62C7, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("364D8E20-62C7-11CF-A5D6-28DB04C10000", KSEVENTSETID_Clock); #define KSEVENTSETID_Clock DEFINE_GUIDNAMED(KSEVENTSETID_Clock) @@ -491,7 +491,7 @@ */ #define KSPROPSETID_GM \ - 0xAF627536L, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D + 0xAF627536L, 0xE719, 0x11D2, {0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D} typedef enum { @@ -508,7 +508,7 @@ */ #define STATIC_KSPROPSETID_MediaSeeking\ - 0xEE904F0CL, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0xEE904F0CL, 0xD09B, 0x11D0, {0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("EE904F0C-D09B-11D0-ABE9-00A0C9223196", KSPROPSETID_MediaSeeking); #define KSPROPSETID_MediaSeeking DEFINE_GUIDNAMED(KSPROPSETID_MediaSeeking) @@ -652,12 +652,12 @@ */ #define STATIC_KSPROPSETID_Pin\ - 0x8C134960L, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00 + 0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("8C134960-51AD-11CF-878A-94F801C10000", KSPROPSETID_Pin); #define KSPROPSETID_Pin DEFINE_GUIDNAMED(KSPROPSETID_Pin) #define STATIC_KSNAME_Pin\ - 0x146F1A80L, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x146F1A80L, 0x4791, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("146F1A80-4791-11D0-A5D6-28DB04C10000", KSNAME_Pin); #define KSNAME_Pin DEFINE_GUIDNAMED(KSNAME_Pin) @@ -725,7 +725,7 @@ */ #define STATIC_KSPROPSETID_Stream\ - 0x65aaba60L, 0x98ae, 0x11cf, 0xa1, 0x0d, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + 0x65aaba60L, 0x98ae, 0x11cf, {0xa1, 0x0d, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4} DEFINE_GUIDSTRUCT("65aaba60-98ae-11cf-a10d-0020afd156e4", KSPROPSETID_Stream); #define KSPROPSETID_Stream DEFINE_GUIDNAMED(KSPROPSETID_Stream) @@ -844,7 +844,7 @@ */ #define STATIC_KSPROPSETID_StreamAllocator\ - 0xcf6e4342L, 0xec87, 0x11cf, 0xa1, 0x30, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + 0xcf6e4342L, 0xec87, 0x11cf, {0xa1, 0x30, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4} DEFINE_GUIDSTRUCT("cf6e4342-ec87-11cf-a130-0020afd156e4", KSPROPSETID_StreamAllocator); #define KSPROPSETID_StreamAllocator DEFINE_GUIDNAMED(KSPROPSETID_StreamAllocator) @@ -855,7 +855,7 @@ } KSPROPERTY_STREAMALLOCATOR; #define KSMETHODSETID_StreamAllocator \ - 0xcf6e4341L, 0xec87, 0x11cf, 0xa1, 0x30, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + 0xcf6e4341L, 0xec87, 0x11cf, {0xa1, 0x30, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4} typedef enum { @@ -893,7 +893,7 @@ */ #define STATIC_KSPROPSETID_Topology\ - 0x720D4AC0L, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("720D4AC0-7533-11D0-A5D6-28DB04C10000", KSPROPSETID_Topology); #define KSPROPSETID_Topology DEFINE_GUIDNAMED(KSPROPSETID_Topology) @@ -1243,7 +1243,7 @@ */ #define STATIC_KSDATAFORMAT_SPECIFIER_NONE\ - 0x0F6417D6L, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x0F6417D6L, 0xC318, 0x11D0, {0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("0F6417D6-C318-11D0-A43F-00A0C9223196", KSDATAFORMAT_SPECIFIER_NONE); #define KSDATAFORMAT_SPECIFIER_NONE DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_NONE) Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Mon May 31 17:10:25 2010 @@ -28,7 +28,7 @@ /* video */ #define STATIC_PINNAME_VIDEO_CAPTURE \ - 0xfb6c4281, 0x353, 0x11d1, 0x90, 0x5f, 0x0, 0x0, 0xc0, 0xcc, 0x16, 0xba + 0xfb6c4281, 0x353, 0x11d1, {0x90, 0x5f, 0x0, 0x0, 0xc0, 0xcc, 0x16, 0xba} #define STATIC_PINNAME_CAPTURE STATIC_PINNAME_VIDEO_CAPTURE DEFINE_GUIDSTRUCT("FB6C4281-0353-11d1-905F-0000C0CC16BA", PINNAME_VIDEO_CAPTURE); #define PINNAME_VIDEO_CAPTURE DEFINE_GUIDNAMED(PINNAME_VIDEO_CAPTURE) @@ -130,32 +130,32 @@ */ #define STATIC_KSNODETYPE_ADC\ - 0x4D837FE0L, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x4D837FE0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("4D837FE0-C555-11D0-8A2B-00A0C9255AC1", KSNODETYPE_ADC); #define KSNODETYPE_ADC DEFINE_GUIDNAMED(KSNODETYPE_ADC) #define STATIC_KSNODETYPE_AGC\ - 0xE88C9BA0L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0xE88C9BA0L, 0xC557, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("E88C9BA0-C557-11D0-8A2B-00A0C9255AC1", KSNODETYPE_AGC); #define KSNODETYPE_AGC DEFINE_GUIDNAMED(KSNODETYPE_AGC) #define STATIC_KSNODETYPE_3D_EFFECTS\ - 0x55515860L, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x55515860L, 0xC559, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("55515860-C559-11D0-8A2B-00A0C9255AC1", KSNODETYPE_3D_EFFECTS); #define KSNODETYPE_3D_EFFECTS DEFINE_GUIDNAMED(KSNODETYPE_3D_EFFECTS) #define STATIC_KSNODETYPE_SUPERMIX\ - 0xE573ADC0L, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0xE573ADC0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("E573ADC0-C555-11D0-8A2B-00A0C9255AC1", KSNODETYPE_SUPERMIX); #define KSNODETYPE_SUPERMIX DEFINE_GUIDNAMED(KSNODETYPE_SUPERMIX) #define STATIC_KSNODETYPE_SRC\ - 0x9DB7B9E0L, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x9DB7B9E0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("9DB7B9E0-C555-11D0-8A2B-00A0C9255AC1", KSNODETYPE_SRC); #define KSNODETYPE_SRC DEFINE_GUIDNAMED(KSNODETYPE_SRC) #define STATIC_KSNODETYPE_DAC\ - 0x507AE360L, 0xC554, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x507AE360L, 0xC554, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("507AE360-C554-11D0-8A2B-00A0C9255AC1", KSNODETYPE_DAC); #define KSNODETYPE_DAC DEFINE_GUIDNAMED(KSNODETYPE_DAC) @@ -175,12 +175,12 @@ #define KSNODETYPE_CD_PLAYER DEFINE_GUIDNAMED(KSNODETYPE_CD_PLAYER) #define STATIC_KSNODETYPE_CHORUS\ - 0x20173F20L, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x20173F20L, 0xC559, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("20173F20-C559-11D0-8A2B-00A0C9255AC1", KSNODETYPE_CHORUS); #define KSNODETYPE_CHORUS DEFINE_GUIDNAMED(KSNODETYPE_CHORUS) #define STATIC_KSNODETYPE_REVERB\ - 0xEF0328E0L, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0xEF0328E0L, 0xC558, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("EF0328E0-C558-11D0-8A2B-00A0C9255AC1", KSNODETYPE_REVERB); #define KSNODETYPE_REVERB DEFINE_GUIDNAMED(KSNODETYPE_REVERB) @@ -201,127 +201,127 @@ #define KSNODETYPE_SPEAKER DEFINE_GUIDNAMED(KSNODETYPE_SPEAKER) #define STATIC_KSAUDFNAME_RECORDING_CONTROL\ - 0x185FEDFAL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDFAL, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDFA-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_RECORDING_CONTROL); #define KSAUDFNAME_RECORDING_CONTROL DEFINE_GUIDNAMED(KSAUDFNAME_RECORDING_CONTROL) #define STATIC_KSNODETYPE_VOLUME\ - 0x3A5ACC00L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x3A5ACC00L, 0xC557, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("3A5ACC00-C557-11D0-8A2B-00A0C9255AC1", KSNODETYPE_VOLUME); #define KSNODETYPE_VOLUME DEFINE_GUIDNAMED(KSNODETYPE_VOLUME) #define STATIC_KSAUDFNAME_WAVE_VOLUME\ - 0x185FEDE5L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDE5L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDE5-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_WAVE_VOLUME); #define KSAUDFNAME_WAVE_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_WAVE_VOLUME) #define STATIC_KSNODETYPE_MUTE\ - 0x02B223C0L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x02B223C0L, 0xC557, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("02B223C0-C557-11D0-8A2B-00A0C9255AC1", KSNODETYPE_MUTE); #define KSNODETYPE_MUTE DEFINE_GUIDNAMED(KSNODETYPE_MUTE) #define STATIC_KSAUDFNAME_WAVE_MUTE\ - 0x185FEDE6L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDE6L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDE6-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_WAVE_MUTE); #define KSAUDFNAME_WAVE_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_WAVE_MUTE) #define STATIC_KSAUDFNAME_MIC_VOLUME\ - 0x185FEDEDL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDEDL, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDED-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIC_VOLUME); #define KSAUDFNAME_MIC_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MIC_VOLUME) #define STATIC_KSNODETYPE_SUM\ - 0xDA441A60L, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0xDA441A60L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("DA441A60-C556-11D0-8A2B-00A0C9255AC1", KSNODETYPE_SUM); #define KSNODETYPE_SUM DEFINE_GUIDNAMED(KSNODETYPE_SUM) #define STATIC_KSAUDFNAME_MASTER_VOLUME\ - 0x185FEDE3L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDE3L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDE3-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MASTER_VOLUME); #define KSAUDFNAME_MASTER_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MASTER_VOLUME) #define STATIC_KSAUDFNAME_CD_VOLUME\ - 0x185FEDE9L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDE9L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDE9-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_CD_VOLUME); #define KSAUDFNAME_CD_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_CD_VOLUME) #define STATIC_KSAUDFNAME_RECORDING_SOURCE\ - 0x185FEDEFL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDEFL, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDEF-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_RECORDING_SOURCE); #define KSAUDFNAME_RECORDING_SOURCE DEFINE_GUIDNAMED(KSAUDFNAME_RECORDING_SOURCE) #define STATIC_KSAUDFNAME_LINE_IN_VOLUME\ - 0x185FEDF4L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDF4L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDF4-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_LINE_IN_VOLUME); #define KSAUDFNAME_LINE_IN_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_LINE_IN_VOLUME) #define STATIC_KSAUDFNAME_AUX_VOLUME\ - 0x185FEDFCL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDFCL, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDFC-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_AUX_VOLUME); #define KSAUDFNAME_AUX_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_AUX_VOLUME) #define STATIC_KSAUDFNAME_MIC_IN_VOLUME\ - 0x185FEDF5L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDF5L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDF5-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIC_IN_VOLUME); #define KSAUDFNAME_MIC_IN_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MIC_IN_VOLUME) #define STATIC_KSNODETYPE_LOUDNESS\ - 0x41887440L, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x41887440L, 0xC558, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("41887440-C558-11D0-8A2B-00A0C9255AC1", KSNODETYPE_LOUDNESS); #define KSNODETYPE_LOUDNESS DEFINE_GUIDNAMED(KSNODETYPE_LOUDNESS) #define STATIC_KSAUDFNAME_MICROPHONE_BOOST\ - 0x2bc31d6aL, 0x96e3, 0x11d2, 0xac, 0x4c, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 + 0x2bc31d6aL, 0x96e3, 0x11d2, {0xac, 0x4c, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68} DEFINE_GUIDSTRUCT("2BC31D6A-96E3-11d2-AC4C-00C04F8EFB68", KSAUDFNAME_MICROPHONE_BOOST); #define KSAUDFNAME_MICROPHONE_BOOST DEFINE_GUIDNAMED(KSAUDFNAME_MICROPHONE_BOOST) #define STATIC_KSAUDFNAME_CD_MUTE\ - 0x185FEDEAL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDEAL, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDEA-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_CD_MUTE); #define KSAUDFNAME_CD_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_CD_MUTE) #define STATIC_KSAUDFNAME_LINE_MUTE\ - 0x185FEDECL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDECL, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDEC-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_LINE_MUTE); #define KSAUDFNAME_LINE_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_LINE_MUTE) #define STATIC_KSAUDFNAME_MIC_MUTE\ - 0x185FEDEEL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDEEL, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDEE-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIC_MUTE); #define KSAUDFNAME_MIC_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MIC_MUTE) #define STATIC_KSAUDFNAME_AUX_MUTE\ - 0x185FEDFDL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDFDL, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDFD-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_AUX_MUTE); #define KSAUDFNAME_AUX_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_AUX_MUTE) #define STATIC_KSAUDFNAME_VOLUME_CONTROL\ - 0x185FEDF7L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDF7L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDF7-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_VOLUME_CONTROL); #define KSAUDFNAME_VOLUME_CONTROL DEFINE_GUIDNAMED(KSAUDFNAME_VOLUME_CONTROL) #define STATIC_KSNODETYPE_MUX\ - 0x2CEAF780L, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x2CEAF780L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("2CEAF780-C556-11D0-8A2B-00A0C9255AC1", KSNODETYPE_MUX); #define KSNODETYPE_MUX DEFINE_GUIDNAMED(KSNODETYPE_MUX) #define STATIC_KSAUDFNAME_MASTER_MUTE\ - 0x185FEDE4L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDE4L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDE4-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MASTER_MUTE); #define KSAUDFNAME_MASTER_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MASTER_MUTE) #define STATIC_KSNODETYPE_PEAKMETER\ - 0xa085651eL, 0x5f0d, 0x4b36, 0xa8, 0x69, 0xd1, 0x95, 0xd6, 0xab, 0x4b, 0x9e + 0xa085651eL, 0x5f0d, 0x4b36, {0xa8, 0x69, 0xd1, 0x95, 0xd6, 0xab, 0x4b, 0x9e} DEFINE_GUIDSTRUCT("A085651E-5F0D-4b36-A869-D195D6AB4B9E", KSNODETYPE_PEAKMETER); #define KSNODETYPE_PEAKMETER DEFINE_GUIDNAMED(KSNODETYPE_PEAKMETER) #define STATIC_KSNODETYPE_STEREO_WIDE\ - 0xA9E69800L, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0xA9E69800L, 0xC558, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("A9E69800-C558-11D0-8A2B-00A0C9255AC1", KSNODETYPE_STEREO_WIDE); #define KSNODETYPE_STEREO_WIDE DEFINE_GUIDNAMED(KSNODETYPE_STEREO_WIDE) #define STATIC_KSNODETYPE_TONE\ - 0x7607E580L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 + 0x7607E580L, 0xC557, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1} DEFINE_GUIDSTRUCT("7607E580-C557-11D0-8A2B-00A0C9255AC1", KSNODETYPE_TONE); #define KSNODETYPE_TONE DEFINE_GUIDNAMED(KSNODETYPE_TONE) @@ -375,11 +375,11 @@ } KSDATARANGE_AUDIO, *PKSDATARANGE_AUDIO; #if !defined( DEFINE_WAVEFORMATEX_GUID ) -#define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 +#define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} #endif #define STATIC_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX\ - 0x00000000L, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 + 0x00000000L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} DEFINE_GUIDSTRUCT("00000000-0000-0010-8000-00aa00389b71", KSDATAFORMAT_SUBTYPE_WAVEFORMATEX); #define KSDATAFORMAT_SUBTYPE_WAVEFORMATEX DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX) @@ -403,12 +403,12 @@ #define KSDATAFORMAT_TYPE_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_AUDIO) #define STATIC_KSDATAFORMAT_SPECIFIER_DSOUND\ - 0x518590a2L, 0xa184, 0x11d0, 0x85, 0x22, 0x00, 0xc0, 0x4f, 0xd9, 0xba, 0xf3 + 0x518590a2L, 0xa184, 0x11d0, {0x85, 0x22, 0x00, 0xc0, 0x4f, 0xd9, 0xba, 0xf3} DEFINE_GUIDSTRUCT("518590a2-a184-11d0-8522-00c04fd9baf3", KSDATAFORMAT_SPECIFIER_DSOUND); #define KSDATAFORMAT_SPECIFIER_DSOUND DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_DSOUND) #define STATIC_KSDATAFORMAT_SUBTYPE_ANALOG\ - 0x6dba3190L, 0x67bd, 0x11cf, 0xa0, 0xf7, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + 0x6dba3190L, 0x67bd, 0x11cf, {0xa0, 0xf7, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4} DEFINE_GUIDSTRUCT("6dba3190-67bd-11cf-a0f7-0020afd156e4", KSDATAFORMAT_SUBTYPE_ANALOG); #define KSDATAFORMAT_SUBTYPE_ANALOG DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_ANALOG) @@ -446,22 +446,22 @@ #define KSDATAFORMAT_SUBTYPE_IEEE_FLOAT DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) #define STATIC_KSDATAFORMAT_SPECIFIER_WAVEFORMATEX\ - 0x05589f81L, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a + 0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a} DEFINE_GUIDSTRUCT("05589f81-c356-11ce-bf01-00aa0055595a", KSDATAFORMAT_SPECIFIER_WAVEFORMATEX); #define KSDATAFORMAT_SPECIFIER_WAVEFORMATEX DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX) #define STATIC_KSDATAFORMAT_SUBTYPE_AC3_AUDIO\ - 0xe06d802cL, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea + 0xe06d802cL, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea} DEFINE_GUIDSTRUCT("e06d802c-db46-11cf-b4d1-00805f6cbbea", KSDATAFORMAT_SUBTYPE_AC3_AUDIO); #define KSDATAFORMAT_SUBTYPE_AC3_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_AC3_AUDIO) #define STATIC_KSDATAFORMAT_SPECIFIER_AC3_AUDIO\ - 0xe06d80e4L, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea + 0xe06d80e4L, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea} DEFINE_GUIDSTRUCT("e06d80e4-db46-11cf-b4d1-00805f6cbbea", KSDATAFORMAT_SPECIFIER_AC3_AUDIO); #define KSDATAFORMAT_SPECIFIER_AC3_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_AC3_AUDIO) #define STATIC_KSPROPSETID_AC3\ - 0xBFABE720L, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00 + 0xBFABE720L, 0x6E1F, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00} DEFINE_GUIDSTRUCT("BFABE720-6E1F-11D0-BCF2-444553540000", KSPROPSETID_AC3); #define KSPROPSETID_AC3 DEFINE_GUIDNAMED(KSPROPSETID_AC3) @@ -532,7 +532,7 @@ } KSPROPERTY_AUDIO; #define STATIC_KSEVENTSETID_AudioControlChange\ - 0xE85E9698L, 0xFA2F, 0x11D1, 0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0xE85E9698L, 0xFA2F, 0x11D1, {0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("E85E9698-FA2F-11D1-95BD-00C04FB925D3", KSEVENTSETID_AudioControlChange); #define KSEVENTSETID_AudioControlChange DEFINE_GUIDNAMED(KSEVENTSETID_AudioControlChange) @@ -542,7 +542,7 @@ #define STATIC_KSEVENTSETID_LoopedStreaming\ - 0x4682B940L, 0xC6EF, 0x11D0, 0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D + 0x4682B940L, 0xC6EF, 0x11D0, {0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D} DEFINE_GUIDSTRUCT("4682B940-C6EF-11D0-96D8-00AA0051E51D", KSEVENTSETID_LoopedStreaming); #define KSEVENTSETID_LoopedStreaming DEFINE_GUIDNAMED(KSEVENTSETID_LoopedStreaming) @@ -551,7 +551,7 @@ } KSEVENT_LOOPEDSTREAMING; #define STATIC_KSEVENTSETID_Connection\ - 0x7f4bcbe0L, 0x9ea5, 0x11cf, 0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00 + 0x7f4bcbe0L, 0x9ea5, 0x11cf, {0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00} DEFINE_GUIDSTRUCT("7f4bcbe0-9ea5-11cf-a5d6-28db04c10000", KSEVENTSETID_Connection); #define KSEVENTSETID_Connection DEFINE_GUIDNAMED(KSEVENTSETID_Connection)

14 years, 7 months

[tkreuzer] 47497: [ntstrsafe.h] - Fix a number of parameter types (LPSTR/LPCSTR instead of PCHAR, PCCHAR) This is not the same, PCCHAR is a char * not a const char *

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 17:07:19 2010 New Revision: 47497 URL: http://svn.reactos.org/svn/reactos?rev=47497&view=rev Log: [ntstrsafe.h] - Fix a number of parameter types (LPSTR/LPCSTR instead of PCHAR, PCCHAR) This is not the same, PCCHAR is a char * not a const char * Modified: trunk/reactos/include/ddk/ntstrsafe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Mon May 31 17:07:19 2010 @@ -36,7 +36,7 @@ __inline NTSTATUS NTAPI -RtlStringLengthWorkerA(IN PCHAR String, +RtlStringLengthWorkerA(IN LPCSTR String, IN SIZE_T MaxLength, OUT PSIZE_T ReturnLength OPTIONAL) { @@ -69,7 +69,7 @@ __inline NTSTATUS NTAPI -RtlStringValidateDestA(IN PCHAR Destination, +RtlStringValidateDestA(IN LPSTR Destination, IN SIZE_T Length, OUT PSIZE_T ReturnLength OPTIONAL, IN SIZE_T MaxLength) @@ -98,7 +98,7 @@ __inline NTSTATUS NTAPI -RtlStringExValidateDestA(IN OUT PCHAR *Destination, +RtlStringExValidateDestA(IN OUT LPSTR *Destination, IN OUT PSIZE_T DestinationLength, OUT PSIZE_T ReturnLength OPTIONAL, IN SIZE_T MaxLength, @@ -114,7 +114,7 @@ __inline NTSTATUS NTAPI -RtlStringExValidateSrcA(IN OUT PCCHAR *Source OPTIONAL, +RtlStringExValidateSrcA(IN OUT LPCSTR *Source OPTIONAL, IN OUT PSIZE_T ReturnLength OPTIONAL, IN SIZE_T MaxLength, IN DWORD Flags) @@ -133,10 +133,10 @@ __inline NTSTATUS NTAPI -RtlStringVPrintfWorkerA(OUT PCHAR Destination, +RtlStringVPrintfWorkerA(OUT LPSTR Destination, IN SIZE_T Length, OUT PSIZE_T NewLength OPTIONAL, - IN PCCHAR Format, + IN LPCSTR Format, IN va_list argList) { NTSTATUS Status = STATUS_SUCCESS; @@ -174,10 +174,10 @@ __inline NTSTATUS NTAPI -RtlStringCopyWorkerA(OUT PCHAR Destination, +RtlStringCopyWorkerA(OUT LPSTR Destination, IN SIZE_T Length, OUT PSIZE_T NewLength OPTIONAL, - IN PCCHAR Source, + IN LPCSTR Source, IN SIZE_T CopyLength) { NTSTATUS Status = STATUS_SUCCESS; @@ -211,9 +211,9 @@ __inline NTSTATUS NTAPI -RtlStringCchCopyA(IN PCHAR Destination, +RtlStringCchCopyA(IN LPSTR Destination, IN SIZE_T cchDest, - IN PCCHAR pszSrc) + IN LPCSTR pszSrc) { ASSERTMSG("RtlStringCchCopyA is UNIMPLEMENTED!\n", FALSE); return STATUS_NOT_IMPLEMENTED; @@ -222,9 +222,9 @@ __inline NTSTATUS NTAPI -RtlStringCbPrintfA(OUT PCHAR Destination, +RtlStringCbPrintfA(OUT LPSTR Destination, IN SIZE_T Length, - IN PCHAR Format, + IN LPCSTR Format, ...) { NTSTATUS Status; @@ -252,12 +252,12 @@ __inline NTSTATUS NTAPI -RtlStringCbPrintfExA(OUT PCHAR Destination, +RtlStringCbPrintfExA(OUT LPSTR Destination, IN SIZE_T Length, - OUT PCHAR *DestinationEnd OPTIONAL, + OUT LPSTR *DestinationEnd OPTIONAL, OUT PSIZE_T RemainingSize OPTIONAL, IN DWORD Flags, - IN PCCHAR Format, + IN LPCSTR Format, ...) { NTSTATUS Status; @@ -333,10 +333,10 @@ __inline NTSTATUS NTAPI -RtlStringCbCopyExA(OUT PCHAR Destination, +RtlStringCbCopyExA(OUT LPSTR Destination, IN SIZE_T Length, - IN PCCHAR Source, - OUT PCHAR *DestinationEnd OPTIONAL, + IN LPCSTR Source, + OUT LPSTR *DestinationEnd OPTIONAL, OUT PSIZE_T RemainingSize OPTIONAL, IN DWORD Flags) { @@ -423,10 +423,10 @@ __inline NTSTATUS NTAPI -RtlStringCbCatExA(IN OUT PCHAR Destination, +RtlStringCbCatExA(IN OUT LPSTR Destination, IN SIZE_T Length, - IN PCCHAR Source, - OUT PCHAR *DestinationEnd OPTIONAL, + IN LPCSTR Source, + OUT LPSTR *DestinationEnd OPTIONAL, OUT PSIZE_T RemainingSize OPTIONAL, IN DWORD Flags) { @@ -497,9 +497,9 @@ __inline NTSTATUS NTAPI -RtlStringCbCopyA(OUT PCHAR Destination, +RtlStringCbCopyA(OUT LPSTR Destination, IN SIZE_T Length, - IN PCCHAR Source) + IN LPCSTR Source) { NTSTATUS Status; SIZE_T CharLength = Length / sizeof(CHAR);

14 years, 7 months

[tkreuzer] 47496: [CMIDRIVER] - Fix a number of warnings, no actual code change - Patch by Love Nystrom, improvements by me See issue #5336 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 31 16:58:43 2010 New Revision: 47496 URL: http://svn.reactos.org/svn/reactos?rev=47496&view=rev Log: [CMIDRIVER] - Fix a number of warnings, no actual code change - Patch by Love Nystrom, improvements by me See issue #5336 for more details. Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp [iso-8859-1] Mon May 31 16:58:43 2010 @@ -29,7 +29,9 @@ #include <initguid.h> #include "adapter.hpp" -//#pragma code_seg("PAGE") +#ifdef _MSC_VER +//#pragma code_seg("PAGE") // GCC ignores pragma code_seg +#endif const GUID KSNODETYPE_DAC = {0x507AE360L, 0xC554, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; const GUID KSNODETYPE_ADC = {0x4D837FE0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; @@ -267,7 +269,9 @@ PUNKNOWN unknownTopology = NULL; // install the topology miniport. - ntStatus = InstallSubdevice(DeviceObject, Irp, L"Topology", CLSID_PortTopology, CLSID_PortTopology, CreateMiniportTopologyCMI, pCMIAdapter, NULL, GUID_NULL, &unknownTopology); + ntStatus = InstallSubdevice( DeviceObject, Irp, (PWCHAR) L"Topology", + CLSID_PortTopology, CLSID_PortTopology, CreateMiniportTopologyCMI, + pCMIAdapter, NULL, GUID_NULL, &unknownTopology ); if (!NT_SUCCESS (ntStatus)) { DBGPRINT(("Topology miniport installation failed")); return ntStatus; @@ -277,7 +281,7 @@ // install the UART miniport - execution order important ntStatus = STATUS_UNSUCCESSFUL; MPUBase = 0; - for (int i=0;i<ResourceList->NumberOfPorts();i++) { + for ( UINT i=0; i < ResourceList->NumberOfPorts(); i++ ) { if (ResourceList->FindTranslatedPort(i)->u.Port.Length == 2) { MPUBase = (UInt32*)ResourceList->FindTranslatedPort(i)->u.Port.Start.QuadPart; } @@ -285,7 +289,10 @@ if (MPUBase != 0) { ntStatus = pCMIAdapter->activateMPU(MPUBase); if (NT_SUCCESS(ntStatus)) { - ntStatus = InstallSubdevice(DeviceObject, Irp, L"Uart", CLSID_PortDMus, CLSID_MiniportDriverDMusUART, NULL, pCMIAdapter->getInterruptSync(), UartResourceList, IID_IPortDMus, NULL); + ntStatus = InstallSubdevice( DeviceObject, Irp, (PWCHAR) L"Uart", + CLSID_PortDMus, CLSID_MiniportDriverDMusUART, NULL, + pCMIAdapter->getInterruptSync(), UartResourceList, + IID_IPortDMus, NULL ); } } if (!NT_SUCCESS(ntStatus)) { @@ -300,9 +307,13 @@ // install the wave miniport - the order matters here #ifdef WAVERT - ntStatus = InstallSubdevice(DeviceObject, Irp, L"Wave", CLSID_PortWaveRT, CLSID_PortWaveRT, CreateMiniportWaveCMI, pCMIAdapter, ResourceList, IID_IPortWaveRT, &unknownWave); + ntStatus = InstallSubdevice(DeviceObject, Irp, (PWCHAR) L"Wave", + CLSID_PortWaveRT, CLSID_PortWaveRT, CreateMiniportWaveCMI, + pCMIAdapter, ResourceList, IID_IPortWaveRT, &unknownWave ); #else - ntStatus = InstallSubdevice(DeviceObject, Irp, L"Wave", CLSID_PortWaveCyclic, CLSID_PortWaveCyclic, CreateMiniportWaveCMI, pCMIAdapter, ResourceList, IID_IPortWaveCyclic, &unknownWave); + ntStatus = InstallSubdevice(DeviceObject, Irp, (PWCHAR) L"Wave", + CLSID_PortWaveCyclic, CLSID_PortWaveCyclic, CreateMiniportWaveCMI, + pCMIAdapter, ResourceList, IID_IPortWaveCyclic, &unknownWave ); #endif if (!NT_SUCCESS(ntStatus)) { DBGPRINT(("Wave miniport installation failed")); @@ -449,8 +460,10 @@ resourceList->List[0].Count = 0; // copy the resources which have already been assigned - for (int i=0;i<list->List[0].Count;i++) { - if (CopyResourceDescriptor(&list->List[0].Descriptors[i], &resourceList->List[0].Descriptors[resourceList->List[0].Count])) { + for ( UINT i=0; i < list->List[0].Count; i++ ) { + if (CopyResourceDescriptor( &list->List[0].Descriptors[i], + &resourceList->List[0].Descriptors[resourceList->List[0].Count] )) + { resourceList->List[0].Count++; } } Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp [iso-8859-1] Mon May 31 16:58:43 2010 @@ -27,7 +27,9 @@ #include "common.hpp" -#pragma code_seg("PAGE") +#ifdef _MSC_VER +#pragma code_seg("PAGE") /* warning - ignored by GCC compiler */ +#endif NTSTATUS NewCMIAdapter( @@ -63,7 +65,7 @@ DeviceObject = aDeviceObject; cm.IOBase = 0; - for (int i=0;i<ResourceList->NumberOfPorts();i++) { + for ( UINT i=0; i < ResourceList->NumberOfPorts(); i++ ) { if (ResourceList->FindTranslatedPort(i)->u.Port.Length == 0x100) { cm.IOBase = (UInt32*)ResourceList->FindTranslatedPort(i)->u.Port.Start.QuadPart; } @@ -357,7 +359,7 @@ //PAGED_CODE(); DBGPRINT(("CCMIAdapter[%p]::loadSBMixerFromMemory()", this)); #endif - for (int i = 0; i<(sizeof(sbIndex)/sizeof(sbIndex[0]));i++) { + for ( UINT i = 0; i < (sizeof(sbIndex)/sizeof(sbIndex[0])); i++ ) { writeUInt8(REG_SBINDEX, sbIndex[i]); writeUInt8(REG_SBDATA, mixerCache[i]); } @@ -368,7 +370,9 @@ /* ** non-paged code below */ -#pragma code_seg() +#ifdef _MSC_VER +#pragma code_seg() /* warning - ignored by GCC compiler */ +#endif STDMETHODIMP_(UInt8) CCMIAdapter::readUInt8(UInt8 reg) { Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp [iso-8859-1] Mon May 31 16:58:43 2010 @@ -31,7 +31,9 @@ #define NTSTRSAFE_LIB //for Windows 2000 compatibility #include "ntstrsafe.h" -#pragma code_seg("PAGE") +#ifdef _MSC_VER +#pragma code_seg("PAGE") /* warning - ignored by GCC compiler */ +#endif const GUID KSPROPSETID_CMI = {0x2B81CDBB, 0xEE6C, 0x4ECC, {0x8A, 0xA5, 0x9A, 0x18, 0x8B, 0x02, 0x3D, 0xFF}}; @@ -173,7 +175,7 @@ PropertyRequest.ValueSize = sizeof(DWORD); PropertyRequest.PropertyItem = &PropertyItem; - for (int i=0;i < SIZEOF_ARRAY(TopologyNodes); i++) { + for ( UINT i=0; i < SIZEOF_ARRAY(TopologyNodes); i++ ) { PropertyRequest.Node = i; Channel = CHAN_LEFT; @@ -310,7 +312,7 @@ PropertyRequest.ValueSize = sizeof(DWORD); PropertyRequest.PropertyItem = &PropertyItem; - for (int i=0;i < SIZEOF_ARRAY(TopologyNodes); i++) { + for ( UINT i=0; i < SIZEOF_ARRAY(TopologyNodes); i++ ) { PropertyRequest.Node = i; if (IsEqualGUIDAligned(*(TopologyNodes[i].Type), KSNODETYPE_VOLUME)) { PropertyRequest.Node = i; @@ -473,7 +475,8 @@ CCMITopology *that = (CCMITopology *) ((PMINIPORTTOPOLOGY) PropertyRequest->MajorTarget); NTSTATUS ntStatus = STATUS_INVALID_PARAMETER; - UInt8 data, mask, reg; + //UInt8 data, mask, reg; + UInt8 mask, reg; LONG channel; if (PropertyRequest->Node == ULONG(-1)) { @@ -1042,7 +1045,7 @@ PKSPROPERTY_STEPPING_LONG Range = PKSPROPERTY_STEPPING_LONG(Members + 1); - for (int i=0;i<SIZEOF_ARRAY(VolTable);i++) { + for ( UINT i=0; i < SIZEOF_ARRAY(VolTable); i++ ) { if (VolTable[i].node == PropertyRequest->Node) { Range->Bounds.SignedMaximum = (VolTable[i].max << 16); Range->Bounds.SignedMinimum = (VolTable[i].min << 16); @@ -1110,7 +1113,7 @@ PLONG Level = (PLONG)PropertyRequest->Value; - for (int i=0;i<SIZEOF_ARRAY(VolTable);i++) + for ( UINT i=0; i <SIZEOF_ARRAY(VolTable); i++ ) { if (VolTable[i].node == PropertyRequest->Node) { if (PropertyRequest->Verb & KSPROPERTY_TYPE_GET) { Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp [iso-8859-1] Mon May 31 16:58:43 2010 @@ -35,7 +35,8 @@ #define STATIC_KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF\ DEFINE_WAVEFORMATEX_GUID(WAVE_FORMAT_DOLBY_AC3_SPDIF) DEFINE_GUIDSTRUCT("00000092-0000-0010-8000-00aa00389b71", KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF); -#define KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF) +#define KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF DEFINE_GUIDNAMED( KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF ) +/* Warning - Recursive #define for KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF */ #endif #endif @@ -47,15 +48,17 @@ static KSDATARANGE PinDataRangesBridge[] = { - { - sizeof(KSDATARANGE), - 0, - 0, - 0, - STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO), - STATICGUIDOF(KSDATAFORMAT_SUBTYPE_ANALOG), - STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE) - } + { + { + sizeof(KSDATARANGE), + 0, + 0, + 0, + { STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO) }, + { STATICGUIDOF(KSDATAFORMAT_SUBTYPE_ANALOG) }, + { STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE) } + } + } }; static PKSDATARANGE PinDataRangePointersBridge[] = @@ -65,14 +68,16 @@ static KSDATARANGE WavePinDataRangesAC3Bridge[] = { - { - sizeof(KSDATARANGE), - 0, - 0, - 0, - STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO), - STATICGUIDOF(KSDATAFORMAT_SUBTYPE_AC3_AUDIO), - STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE) + { + { + sizeof(KSDATARANGE), + 0, + 0, + 0, + { STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO) }, + { STATICGUIDOF(KSDATAFORMAT_SUBTYPE_AC3_AUDIO) }, + { STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE) } + } } }; @@ -98,7 +103,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSCATEGORY_AUDIO, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -117,7 +122,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSNODETYPE_SPDIF_INTERFACE, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -136,7 +141,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSNODETYPE_MICROPHONE, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -155,7 +160,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSNODETYPE_CD_PLAYER, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -174,7 +179,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSNODETYPE_LINE_CONNECTOR, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -193,7 +198,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSNODETYPE_ANALOG_CONNECTOR, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -212,7 +217,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSNODETYPE_ANALOG_CONNECTOR, // Category &CMINAME_DAC, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -231,7 +236,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSNODETYPE_SPEAKER, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -250,7 +255,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSCATEGORY_AUDIO, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -269,7 +274,7 @@ KSPIN_COMMUNICATION_NONE, // Communication &KSCATEGORY_AUDIO, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } }, @@ -288,7 +293,7 @@ KSPIN_COMMUNICATION_NONE, // Communication NULL, // Category NULL, // Name - 0 // Reserved + { 0 } // Reserved } } }; Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp [iso-8859-1] Mon May 31 16:58:43 2010 @@ -29,7 +29,9 @@ #include "minwavetables.hpp" #include "ntddk.h" -#pragma code_seg("PAGE") +#ifdef _MSC_VER +#pragma code_seg("PAGE") /* warning - ignored by GCC compiler */ +#endif HRESULT NTAPI CreateMiniportWaveCMI(PUNKNOWN *Unknown, REFCLSID, PUNKNOWN UnknownOuter, POOL_TYPE PoolType) { @@ -233,7 +235,8 @@ PREGISTRYKEY DriverKey; PREGISTRYKEY SettingsKey; UNICODE_STRING KeyName; - DWORD Value, ResultLength; + //DWORD Value, ResultLength; + DWORD ResultLength; PVOID KeyInfo; DBGPRINT(("CMiniportWaveCMI::loadChannelConfigFromRegistry()")); @@ -418,12 +421,12 @@ DBGPRINT(("---channels: %d, resolution: %d, sample rate: %d, pin: %d, formatMask: %x", waveFormat->nChannels, waveFormat->wBitsPerSample, waveFormat->nSamplesPerSec, PinID, cm->formatMask)); //WaveFormatEx - if ( ( format->FormatSize >= sizeof(KSDATAFORMAT_WAVEFORMATEX)) + if ( ( (size_t) format->FormatSize >= sizeof(KSDATAFORMAT_WAVEFORMATEX)) && IsEqualGUIDAligned(format->MajorFormat,KSDATAFORMAT_TYPE_AUDIO) && IsEqualGUIDAligned(format->Specifier,KSDATAFORMAT_SPECIFIER_WAVEFORMATEX) ) { switch (EXTRACT_WAVEFORMATEX_ID(&format->SubFormat)) { case WAVE_FORMAT_PCM: - if ((PinID != PIN_WAVE_RENDER_SINK) && (PinID != PIN_WAVE_CAPTURE_SOURCE) && (PinID != -1)) { + if ((PinID != PIN_WAVE_RENDER_SINK) && (PinID != PIN_WAVE_CAPTURE_SOURCE) && ((int)PinID != -1)) { if ((PinID == PIN_WAVE_AC3_RENDER_SINK) && !IoIsWdmVersionAvailable(6,0)) { return STATUS_INVALID_PARAMETER; } @@ -438,10 +441,10 @@ return isFormatAllowed(waveFormat->nSamplesPerSec, FALSE, FALSE); } if ( (waveFormat->wBitsPerSample == 16) - && ((waveFormat->nChannels >= 4) && (waveFormat->nChannels <= cm->maxChannels)) + && ((waveFormat->nChannels >= 4) && (waveFormat->nChannels <= (WORD) cm->maxChannels)) && ((waveFormat->nSamplesPerSec == 44100) || (waveFormat->nSamplesPerSec == 48000)) ) { #if OUT_CHANNEL == 1 - if ((PinID == PIN_WAVE_RENDER_SINK) || (PinID == -1)) { + if ((PinID == PIN_WAVE_RENDER_SINK) || ((int)PinID == -1)) { return isFormatAllowed(waveFormat->nSamplesPerSec, TRUE, FALSE); } #else @@ -450,7 +453,7 @@ } break; case WAVE_FORMAT_DOLBY_AC3_SPDIF: - if ((PinID != PIN_WAVE_AC3_RENDER_SINK) && (PinID != -1)) { + if ((PinID != PIN_WAVE_AC3_RENDER_SINK) && ((int)PinID != -1)) { return STATUS_INVALID_PARAMETER; } if ( ((waveFormat->wBitsPerSample >= MIN_BITS_PER_SAMPLE_AC3) && (waveFormat->wBitsPerSample <= MAX_BITS_PER_SAMPLE_AC3)) @@ -907,7 +910,7 @@ DBGPRINT(("---streamIndex: %d, channelNumber: %d", streamIndex, channelNumber)); NTSTATUS ntStatus; - UInt8 reg; + //UInt8 reg; UInt32 val; if (state == KSSTATE_RUN) { @@ -990,7 +993,7 @@ NTSTATUS ntStatus = STATUS_SUCCESS; if (currentChannelCount > 2) { - if (Miniport->cm->maxChannels < currentChannelCount) { + if ((WORD) Miniport->cm->maxChannels < currentChannelCount ) { return STATUS_INVALID_DEVICE_REQUEST; } if ((currentResolution != 16) || (currentChannelCount < 2)) { @@ -1052,7 +1055,7 @@ //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::setupSPDIFPlayback(%d)", this, enableSPDIF)); - NTSTATUS ntStatus; + //NTSTATUS ntStatus; KeWaitForSingleObject(&Miniport->mutex, Executive, KernelMode, false, NULL); @@ -1434,7 +1437,9 @@ /* ** non-paged code below */ -#pragma code_seg() +#ifdef _MSC_VER +#pragma code_seg() /* warning - ignored by GCC compiler */ +#endif STDMETHODIMP CMiniportWaveStreamCMI::SetState(KSSTATE NewState) { @@ -1461,7 +1466,9 @@ // STOP -> ACQUIRE -> PAUSE -> PLAY -> PAUSE -> ACQUIRE -> STOP if (state != NewState) { - switch (NewState) { + switch ((UINT) NewState) { + // LN: The cast on NewState is to satisfy the compiler about + // KSSTATE_STOP_AC3, which is not in the original enum KSSTATE. case KSSTATE_ACQUIRE: DBGPRINT(("---KSSTATE_ACQUIRE: previous state: %d", state)); if (state == KSSTATE_PAUSE) { Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp [iso-8859-1] Mon May 31 16:58:43 2010 @@ -31,23 +31,23 @@ #define STATIC_KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF\ DEFINE_WAVEFORMATEX_GUID(WAVE_FORMAT_DOLBY_AC3_SPDIF) DEFINE_GUIDSTRUCT("00000092-0000-0010-8000-00aa00389b71", KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF); -#define KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF) +#define KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF) +/* Warning - Recursive #define for KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF */ NTSTATUS NTAPI PropertyHandler_ChannelConfig(PPCPROPERTY_REQUEST PropertyRequest); - static KSDATARANGE_AUDIO WavePinDataRangesPCMStream[] = { { - { + {{ sizeof(KSDATARANGE_AUDIO), 0, 0, 0, - STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO), - STATICGUIDOF(KSDATAFORMAT_SUBTYPE_PCM), - STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX) - }, + { STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO) }, + { STATICGUIDOF(KSDATAFORMAT_SUBTYPE_PCM) }, + { STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX) } + }}, MAX_CHANNELS_PCM, MIN_BITS_PER_SAMPLE_PCM, MAX_BITS_PER_SAMPLE_PCM, @@ -59,15 +59,15 @@ static KSDATARANGE_AUDIO WavePinDataRangesAC3Stream[] = { { - { + {{ sizeof(KSDATARANGE_AUDIO), 0, 0, 0, - STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO), - STATICGUIDOF(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF), - STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX) - }, + { STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO) }, + { STATICGUIDOF(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF) }, + { STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX) } + }}, MAX_CHANNELS_AC3, MIN_BITS_PER_SAMPLE_AC3, MAX_BITS_PER_SAMPLE_AC3, @@ -75,15 +75,15 @@ MAX_SAMPLE_RATE_AC3 }, { - { + {{ sizeof(KSDATARANGE_AUDIO), 0, 0, 0, - STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO), - STATICGUIDOF(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF), - STATICGUIDOF(KSDATAFORMAT_SPECIFIER_DSOUND) - }, + { STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO) }, + { STATICGUIDOF(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF) }, + { STATICGUIDOF(KSDATAFORMAT_SPECIFIER_DSOUND) } + }}, MAX_CHANNELS_AC3, MIN_BITS_PER_SAMPLE_AC3, MAX_BITS_PER_SAMPLE_AC3, @@ -107,28 +107,28 @@ static KSDATARANGE WavePinDataRangesPCMBridge[] = { - { + {{ sizeof(KSDATARANGE), 0, 0, 0, - STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO), - STATICGUIDOF(KSDATAFORMAT_SUBTYPE_ANALOG), - STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE) - } + { STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO) }, + { STATICGUIDOF(KSDATAFORMAT_SUBTYPE_ANALOG) }, + { STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE) } + }} }; static KSDATARANGE WavePinDataRangesAC3Bridge[] = { - { + {{ sizeof(KSDATARANGE), 0, 0, 0, - STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO), - STATICGUIDOF(KSDATAFORMAT_SUBTYPE_AC3_AUDIO), - STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE) - } + { STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO) }, + { STATICGUIDOF(KSDATAFORMAT_SUBTYPE_AC3_AUDIO) }, + { STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE) } + }} }; static PKSDATARANGE WavePinDataRangePointersPCMBridge[] = @@ -160,7 +160,7 @@ KSPIN_COMMUNICATION_SINK, &KSCATEGORY_AUDIO, &KSAUDFNAME_RECORDING_CONTROL, - 0 + { 0 } } }, @@ -181,7 +181,7 @@ KSPIN_COMMUNICATION_NONE, &KSCATEGORY_AUDIO, NULL, - 0 + { 0 } } }, @@ -202,7 +202,7 @@ KSPIN_COMMUNICATION_SINK, &KSCATEGORY_AUDIO, &KSAUDFNAME_VOLUME_CONTROL, - 0 + { 0 } } }, @@ -223,7 +223,7 @@ KSPIN_COMMUNICATION_NONE, &KSNODETYPE_SPEAKER, NULL, - 0 + { 0 } } }, @@ -244,7 +244,7 @@ KSPIN_COMMUNICATION_SINK, &KSCATEGORY_AUDIO, NULL, - 0 + { 0 } } }, @@ -266,7 +266,7 @@ KSPIN_COMMUNICATION_NONE, &KSNODETYPE_SPDIF_INTERFACE, NULL, - 0 + { 0 } } } };

14 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2010