Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[tfaber] 68287: [NTOS:KE] - Fix a typo in KiGetCacheInformation. Spotted by Mike.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 27 10:58:32 2015 New Revision: 68287 URL: http://svn.reactos.org/svn/reactos?rev=68287&view=rev Log: [NTOS:KE] - Fix a typo in KiGetCacheInformation. Spotted by Mike. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat Jun 27 10:58:32 2015 @@ -679,7 +679,7 @@ /* Check if we support CPUID 0x80000005 */ KiCpuId(&CpuInfo, 0x80000000); - if (CpuInfo.Eax >= 0x80000006) + if (CpuInfo.Eax >= 0x80000005) { /* Get L1 size first */ KiCpuId(&CpuInfo, 0x80000005);

9 years, 3 months

[pschweitzer] 68286: [NTFS] Dump available streams (if any!) in case unnamed stream isn't available when trying to read a file

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 27 09:04:39 2015 New Revision: 68286 URL: http://svn.reactos.org/svn/reactos?rev=68286&view=rev Log: [NTFS] Dump available streams (if any!) in case unnamed stream isn't available when trying to read a file Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sat Jun 27 09:04:39 2015 @@ -123,7 +123,28 @@ Status = FindAttribute(DeviceExt, FileRecord, AttributeData, L"", 0, &DataContext); if (!NT_SUCCESS(Status)) { - DPRINT1("No data associated with file!\n"); + PNTFS_ATTR_RECORD Attribute; + + DPRINT1("No unnamed data stream associated with file!\n"); + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && + Attribute->Type != AttributeEnd) + { + if (Attribute->Type == AttributeData) + { + UNICODE_STRING Name; + + ASSERT(Attribute->NameLength != 0); + Name.Length = Attribute->NameLength * sizeof(WCHAR); + Name.MaximumLength = Name.Length; + Name.Buffer = (PWCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset); + DPRINT1("Data stream: '%wZ' available\n", &Name); + } + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + } + ExFreePoolWithTag(FileRecord, TAG_NTFS); if (AllocatedBuffer) {

9 years, 3 months

[pschweitzer] 68285: [NTFS] Don't attempt to open the unnamed stream from $DATA attribute on file lookup. It was unused & leaking. It fixes opening files that don't have unnamed stream (even though...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 27 08:55:34 2015 New Revision: 68285 URL: http://svn.reactos.org/svn/reactos?rev=68285&view=rev Log: [NTFS] Don't attempt to open the unnamed stream from $DATA attribute on file lookup. It was unused & leaking. It fixes opening files that don't have unnamed stream (even though we cannot read there contents yet as we only support unnamed stream) Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sat Jun 27 08:55:34 2015 @@ -530,7 +530,6 @@ ULONGLONG CurrentDir; UNICODE_STRING File; PFILE_RECORD_HEADER FileRecord; - PNTFS_ATTR_CONTEXT DataContext; ULONGLONG MFTIndex; DPRINT1("NtfsDirFindFile(%p, %p, %S, %p)\n", Vcb, DirectoryFcb, FileToFind, FoundFCB); @@ -539,7 +538,7 @@ RtlInitUnicodeString(&File, FileToFind); CurrentDir = DirectoryFcb->MFTIndex; - Status = NtfsLookupFileAt(Vcb, &File, &FileRecord, &DataContext, &MFTIndex, CurrentDir); + Status = NtfsLookupFileAt(Vcb, &File, &FileRecord, &MFTIndex, CurrentDir); if (!NT_SUCCESS(Status)) { return Status; Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sat Jun 27 08:55:34 2015 @@ -718,7 +718,6 @@ NtfsLookupFileAt(PDEVICE_EXTENSION Vcb, PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex) { @@ -726,7 +725,7 @@ NTSTATUS Status; ULONG FirstEntry = 0; - DPRINT("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); + DPRINT("NtfsLookupFileAt(%p, %wZ, %p, %I64x)\n", Vcb, PathName, FileRecord, CurrentMFTIndex); FsRtlDissectName(*PathName, &Current, &Remaining); @@ -759,21 +758,6 @@ DPRINT("NtfsLookupFileAt: Can't read MFT record\n"); ExFreePoolWithTag(*FileRecord, TAG_NTFS); return Status; - } - - if (!((*FileRecord)->Flags & FRH_DIRECTORY)) - { - Status = FindAttribute(Vcb, *FileRecord, AttributeData, L"", 0, DataContext); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtfsLookupFileAt: Can't find data attribute\n"); - ExFreePoolWithTag(*FileRecord, TAG_NTFS); - return Status; - } - } - else - { - *DataContext = NULL; } *MFTIndex = CurrentMFTIndex; @@ -785,10 +769,9 @@ NtfsLookupFile(PDEVICE_EXTENSION Vcb, PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex) { - return NtfsLookupFileAt(Vcb, PathName, FileRecord, DataContext, MFTIndex, NTFS_FILE_ROOT); + return NtfsLookupFileAt(Vcb, PathName, FileRecord, MFTIndex, NTFS_FILE_ROOT); } NTSTATUS Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Jun 27 08:55:34 2015 @@ -723,14 +723,12 @@ NtfsLookupFile(PDEVICE_EXTENSION Vcb, PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex); NTSTATUS NtfsLookupFileAt(PDEVICE_EXTENSION Vcb, PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex);

9 years, 3 months

[akhaldi] 68284: [USERENV] Add %HOMEDRIVE% and %HOMEPATH% environment variables. Brought to you by Radek Liška. CORE-9875

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 26 18:59:25 2015 New Revision: 68284 URL: http://svn.reactos.org/svn/reactos?rev=68284&view=rev Log: [USERENV] Add %HOMEDRIVE% and %HOMEPATH% environment variables. Brought to you by Radek Liška. CORE-9875 Modified: trunk/reactos/dll/win32/userenv/environment.c trunk/reactos/dll/win32/userenv/precomp.h Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Fri Jun 26 18:59:25 2015 @@ -510,10 +510,30 @@ Buffer, &Length)) { + DWORD MinLen = 2; + SetUserEnvironmentVariable(lpEnvironment, L"USERPROFILE", Buffer, FALSE); + + /* At least <drive letter>:<path> */ + if (Length > MinLen) + { + /* Set 'HOMEDRIVE' variable */ + StringCchCopyNW(szValue, MAX_PATH, Buffer, MinLen); + SetUserEnvironmentVariable(lpEnvironment, + L"HOMEDRIVE", + szValue, + FALSE); + + /* Set 'HOMEPATH' variable */ + StringCchCopyNW(szValue, MAX_PATH, Buffer + MinLen, Length - MinLen); + SetUserEnvironmentVariable(lpEnvironment, + L"HOMEPATH", + szValue, + FALSE); + } } if (GetUserAndDomainName(hToken, Modified: trunk/reactos/dll/win32/userenv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/precomp.… ============================================================================== --- trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] Fri Jun 26 18:59:25 2015 @@ -15,6 +15,7 @@ #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> #include <userenv.h> +#include <strsafe.h> #include "internal.h"

9 years, 3 months

[akhaldi] 68283: [SHELL32] Get the Run dialog icon from shell32. By Jared Smudde. CORE-9837

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 26 18:32:57 2015 New Revision: 68283 URL: http://svn.reactos.org/svn/reactos?rev=68283&view=rev Log: [SHELL32] Get the Run dialog icon from shell32. By Jared Smudde. CORE-9837 Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -377,7 +377,6 @@ prfdp->hIcon = LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO); SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM)prfdp->hIcon); SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); - SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0); SetFocus (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH)); Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "ÐÐ°Ð¿Ð¸ÑÐµÑÐµ Ð¸Ð¼ÐµÑÐ¾ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ, Ð¿Ð°Ð¿ÐºÐ°, Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Ð¸Ð»Ð¸ Ð¸Ð½ÑÐµÑÐ½ÐµÑ Ð¸Ð·ÑÐ¾ÑÐ½Ð¸Ðº Ð¸ Ð ÐµÐ°ÐºÑÐÐ¡ ÑÐµ Ð³Ð¾ Ð¾ÑÐ²Ð¾ÑÐ¸.", 12289, 36, 11, 182, 18 LTEXT "&ÐÑÐ²Ð°ÑÑÐ½Ðµ:", 12305, 7, 39, 40, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 46, 37, 180, 100 Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -162,7 +162,7 @@ CAPTION "Spustit" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Zadejte nÃ¡zev programu, sloÅ¾ky, dokumentu, nebo zdroje v sÃti Internet a ReactOS jej pro vÃ¡s otevÅe.", 12289, 36, 11, 182, 18 LTEXT "&OtevÅÃt:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -162,7 +162,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Indtast navnet pÃ¥ det program, mappe, dokument, eller Internet Ressourcer, du vil have at ReactOS skal Ã¥bne for dig.", 12289, 36, 11, 182, 18 LTEXT "&Ãbn:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "AusfÃ¼hren" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Geben Sie den Namen eines Programms, eines Ordners, eines Dokuments oder einer Internetressource an.", 12289, 36, 11, 182, 18 LTEXT "&Ãffnen:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î®ÏÏÎµ ÏÎ¿ ÏÎ½Î¿Î¼Î± ÎµÎ½ÏÏ ÏÏÎ¿Î³ÏÎ¬Î¼Î¼Î±ÏÎ¿Ï, ÏÎ±ÎºÎÎ»Î¿Ï, ÎµÎ³Î³ÏÎ¬ÏÎ¿Ï, Î® ÏÏÏÎ¿Ï ÏÎ¿Ï Î´Î¹Î±Î´ÏÎºÏÎ¯Î¿Ï, ÎºÎ±Î¹ ÏÎ¿ ReactOS Î¸Î± ÏÎ¿ Î±Î½Î¿Î¯Î¾ÎµÎ¹.", 12289, 36, 4, 182, 25 LTEXT "Î&Î½Î¿Î¹Î³Î¼Î±:", 12305, 5, 39, 31, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -157,7 +157,7 @@ CAPTION "Ejecutar" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Escriba el nombre de un programa, carpeta, documento o recurso de Internet y ReactOS lo abrirÃ¡ para usted.", 12289, 36, 11, 182, 24 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 182, 18 LTEXT "&Avaa:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "ExÃ©cuter" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et ReactOS l'ouvrira pour vous.", 12289, 36, 11, 182, 18 LTEXT "&Ouvrir :", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "××¤×¢××" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "××§×× ×©× ×©× ×ª××× ××ª, ×ª××§××, ××¡×× ×× ××©×× ××× ××¨× × ×- ReactOS ××¤×ª× ×××ª× ×¢×××¨×.", 12289, 36, 11, 182, 18 LTEXT "&×¤×ª× ××ª:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Ãrd be a program nevÃ©t, egy mappÃ¡Ã©t, dokumentumÃ©t, vagy egy Internet cÃmet, Ã©s a ReactOS megnyitja.", 12289, 36, 11, 182, 18 LTEXT "&MegnyitÃ¡s:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa Internet, e ReactOS la aprirÃ .", 12289, 36, 11, 182, 18 LTEXT "&Apri:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 9, "MS UI Gothic" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããææ¸åãã¤ã³ã¿ã¼ããã ãªã½ã¼ã¹åãå¥åãã¦ãã ããã", 12289, 36, 11, 182, 18 LTEXT "åå(&O):", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 9, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. Wine zal het vervolgens openen.", 12289, 36, 11, 182, 18 LTEXT "&Openen:", 12305, 7, 39, 28, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "KjÃ¸r" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Skriv inn navnet pÃ¥ programmet, mappen, dokumentet etter Internett-ressursen du Ã¸nsker Ã¥ Ã¥pne.", 12289, 36, 11, 182, 18 LTEXT "&Ãpne:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Wpisz nazwÄ programu, katalogu, dokumentu, a ReactOS otworzy go dla ciebie.", 12289, 36, 11, 182, 18 LTEXT "&OtwÃ³rz:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Digite o nome do programa, pasta, documento, ou endereÃ§o Internet, que o ReactOS irÃ¡ abrÃ-lo para vocÃª.", 12289, 36, 11, 182, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Digite o nome do programa, pasta, documento, ou endereÃ§o Internet, que o ReactOS irÃ¡ abrÃ-lo.", 12289, 36, 11, 182, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -158,7 +158,7 @@ CAPTION "Executare" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "TastaÈi numele unui program, dosar, document, sau a unei resurse de Internet, Ã®n vederea deschiderii Ã®n ReactOS.", 12289, 36, 11, 187, 18 LTEXT "&Deschide:", 12305, 7, 39, 33, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 41, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -158,7 +158,7 @@ CAPTION "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ, Ð¿Ð°Ð¿ÐºÐ¸, Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð¸Ð»Ð¸ ÑÐµÑÑÑÑ ÐÐ½ÑÐµÑÐ½ÐµÑÐ°, Ð¸ ReactOS Ð¾ÑÐºÑÐ¾ÐµÑ Ð¸Ñ.", 12289, 36, 11, 182, 18 LTEXT "&ÐÑÐºÑÑÑÑ:", 12305, 7, 39, 34, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 43, 37, 176, 100 Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Spustenie" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Zadajte nÃ¡zov programu, prieÄinka, dokumentu alebo internetovÃ©ho zdroja a systÃ©m ReactOS ho otvorÃ.", 12289, 36, 11, 182, 18 LTEXT "&OtvoriÅ¥:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in Wine ga (jo) bo odprl.", 12289, 36, 11, 182, 18 LTEXT "&Odpri:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -160,7 +160,7 @@ CAPTION "EKzekuto" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Shkruaj emrin e njÃ« programi, dosje, dokumenti, apo burim interneti, dhe ReactOS do tÃ« hap atÃ« pÃ«r ju.", 12289, 36, 11, 182, 18 LTEXT "&Hap:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Skriv namnet pÃ¥ ett program, en mapp eller ett dokument och wine kommer att Ã¶ppna det fÃ¶r dig.", 12289, 36, 11, 182, 18 LTEXT "&Ãppna:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "ÃalÄ±ÅtÄ±r" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Herhangi bir program, dizin, belge veya Internet kaynaÄÄ± seÃ§in ve ReactOS sizin iÃ§in aÃ§sÄ±n.", 12289, 36, 11, 182, 18 LTEXT "&AÃ§:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -156,7 +156,7 @@ CAPTION "ÐÐ¸ÐºÐ¾Ð½Ð°ÑÐ¸" FONT 8, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "ÐÐ²ÐµÐ´ÑÑÑ ÑÐ¼'Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸, ÑÐµÐºÐ¸, Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð°Ð±Ð¾ ÑÐµÑÑÑÑÑ ÐÐ½ÑÐµÑÐ½ÐµÑÑ, Ñ ReactOS Ð²ÑÐ´ÐºÑÐ¸Ñ ÑÑ.", 12289, 36, 11, 182, 18 LTEXT "&ÐÑÐ´ÐºÑÐ¸ÑÐ¸:", 12305, 3, 39, 32, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -165,7 +165,7 @@ CAPTION "è¿è¡" FONT 9, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "è¾å¥ç¨åºï¼ç®å½ï¼æä»¶æèInternetèµæºåï¼ReactOSå°ä¸ºæ¨æå¼å®ã", 12289, 36, 11, 182, 18 LTEXT "æå¼(&O):", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -164,7 +164,7 @@ CAPTION "Run" FONT 9, "MS Shell Dlg" BEGIN - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Jun 26 18:32:57 2015 @@ -232,7 +232,6 @@ #define IDD_RUN 1 #define IDC_RUNDLG_DESCRIPTION 12289 #define IDC_RUNDLG_BROWSE 12288 -#define IDC_RUNDLG_ICON 12297 #define IDC_RUNDLG_EDITPATH 12298 #define IDC_RUNDLG_LABEL 12305

9 years, 3 months

[akhaldi] 68282: [MSIEXEC][RUNONCE][WINLOGON] Properly track resource file dependencies. CORE-9806

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 26 18:04:31 2015 New Revision: 68282 URL: http://svn.reactos.org/svn/reactos?rev=68282&view=rev Log: [MSIEXEC][RUNONCE][WINLOGON] Properly track resource file dependencies. CORE-9806 Modified: trunk/reactos/base/system/msiexec/CMakeLists.txt trunk/reactos/base/system/runonce/CMakeLists.txt trunk/reactos/base/system/winlogon/CMakeLists.txt Modified: trunk/reactos/base/system/msiexec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/CMakeL… ============================================================================== --- trunk/reactos/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/CMakeLists.txt [iso-8859-1] Fri Jun 26 18:04:31 2015 @@ -7,6 +7,7 @@ service.c precomp.h) +add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/msiexec.ico) add_executable(msiexec ${SOURCE} rsrc.rc) set_module_type(msiexec win32gui) target_link_libraries(msiexec uuid wine) Modified: trunk/reactos/base/system/runonce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/CMakeL… ============================================================================== --- trunk/reactos/base/system/runonce/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/runonce/CMakeLists.txt [iso-8859-1] Fri Jun 26 18:04:31 2015 @@ -1,4 +1,5 @@ +add_rc_deps(runonce.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/icon.ico) add_executable(runonce runonce.c runonce.rc) set_module_type(runonce win32gui UNICODE) add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/CMake… ============================================================================== --- trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] Fri Jun 26 18:04:31 2015 @@ -16,6 +16,7 @@ winlogon.h ${CMAKE_CURRENT_BINARY_DIR}/winreg_s.c) +add_rc_deps(winlogon.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winlogon.ico) add_executable(winlogon ${SOURCE} winlogon.rc) target_link_libraries(winlogon wine) set_module_type(winlogon win32gui)

9 years, 3 months

[akhaldi] 68281: [IEFRAME] Add some missing quotes to ieframe.rc. NFC. Spotted by Jared Smudde. CORE-9843

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 26 17:33:45 2015 New Revision: 68281 URL: http://svn.reactos.org/svn/reactos?rev=68281&view=rev Log: [IEFRAME] Add some missing quotes to ieframe.rc. NFC. Spotted by Jared Smudde. CORE-9843 Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Fri Jun 26 17:33:45 2015 @@ -67,14 +67,14 @@ #include <wine/wine_common_ver.rc> /* @makedep: ietoolbar.bmp */ -IDB_IETOOLBAR BITMAP resources/ietoolbar.bmp +IDB_IETOOLBAR BITMAP "resources/ietoolbar.bmp" #ifdef __REACTOS__ IDC_PAGEICO ICON "resources/pages.ico" #endif /* @makedep: ieframe.rgs */ -1 WINE_REGISTRY ieframe.rgs +1 WINE_REGISTRY "ieframe.rgs" 2 WINE_REGISTRY "ieframe_v1.rgs" 3 WINE_REGISTRY "ieframe_v1.tlb.rgs"

9 years, 3 months

[akhaldi] 68280: [KBSWITCH] Re-register the systray icon after explorer restart. By Joachim Henze. CORE-9869

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 26 17:18:26 2015 New Revision: 68280 URL: http://svn.reactos.org/svn/reactos?rev=68280&view=rev Log: [KBSWITCH] Re-register the systray icon after explorer restart. By Joachim Henze. CORE-9869 Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Fri Jun 26 17:18:26 2015 @@ -390,6 +390,7 @@ { static HMENU hRightPopupMenu; static TCHAR szLCID[MAX_PATH], szLangName[MAX_PATH]; + static UINT s_uTaskbarRestart; switch (Message) { @@ -400,6 +401,7 @@ hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); ActivateLayout(hwnd, ulCurrentLayoutNum); + s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); return 0; } @@ -506,6 +508,11 @@ return 0; } + + default: + if(Message == s_uTaskbarRestart) + AddTrayIcon(hwnd); + break; } return DefWindowProc(hwnd, Message, wParam, lParam);

9 years, 3 months

[akhaldi] 68279: [DDK] Annotate hdaudio.h. CORE-9882

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 26 16:44:31 2015 New Revision: 68279 URL: http://svn.reactos.org/svn/reactos?rev=68279&view=rev Log: [DDK] Annotate hdaudio.h. CORE-9882 Modified: trunk/reactos/include/ddk/hdaudio.h Modified: trunk/reactos/include/ddk/hdaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hdaudio.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/hdaudio.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/hdaudio.h [iso-8859-1] Fri Jun 26 16:44:31 2015 @@ -110,97 +110,121 @@ ULONG InterruptOnCompletion; } HDAUDIO_BUFFER_DESCRIPTOR, *PHDAUDIO_BUFFER_DESCRIPTOR; -typedef NTSTATUS +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PTRANSFER_CODEC_VERBS)( - IN PVOID _context, - IN ULONG Count, - IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, - IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, - IN PVOID Context); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ ULONG Count, + _Inout_updates_(Count) PHDAUDIO_CODEC_TRANSFER CodecTransfer, + _In_opt_ PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, + _In_opt_ PVOID Context); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PALLOCATE_CAPTURE_DMA_ENGINE)( - IN PVOID _context, - IN UCHAR CodecAddress, - IN PHDAUDIO_STREAM_FORMAT StreamFormat, - OUT PHANDLE Handle, - OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ UCHAR CodecAddress, + _In_ PHDAUDIO_STREAM_FORMAT StreamFormat, + _Out_ PHANDLE Handle, + _Out_ PHDAUDIO_CONVERTER_FORMAT ConverterFormat); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PALLOCATE_RENDER_DMA_ENGINE)( - IN PVOID _context, - IN PHDAUDIO_STREAM_FORMAT StreamFormat, - IN BOOLEAN Stripe, - OUT PHANDLE Handle, - OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ PHDAUDIO_STREAM_FORMAT StreamFormat, + _In_ BOOLEAN Stripe, + _Out_ PHANDLE Handle, + _Out_ PHDAUDIO_CONVERTER_FORMAT ConverterFormat); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PCHANGE_BANDWIDTH_ALLOCATION)( - IN PVOID _context, - IN HANDLE Handle, - IN PHDAUDIO_STREAM_FORMAT StreamFormat, - OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ PHDAUDIO_STREAM_FORMAT StreamFormat, + _Out_ PHDAUDIO_CONVERTER_FORMAT ConverterFormat); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PALLOCATE_DMA_BUFFER)( - IN PVOID _context, - IN HANDLE Handle, - IN SIZE_T RequestedBufferSize, - OUT PMDL *BufferMdl, - OUT PSIZE_T AllocatedBufferSize, - OUT PUCHAR StreamId, - OUT PULONG FifoSize); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ SIZE_T RequestedBufferSize, + _Out_ PMDL *BufferMdl, + _Out_ PSIZE_T AllocatedBufferSize, + _Out_ PUCHAR StreamId, + _Out_ PULONG FifoSize); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PFREE_DMA_BUFFER)( - IN PVOID _context, - IN HANDLE Handle); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PFREE_DMA_ENGINE)( - IN PVOID _context, - IN HANDLE Handle); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PSET_DMA_ENGINE_STATE)( - IN PVOID _context, - IN HDAUDIO_STREAM_STATE StreamState, - IN ULONG NumberOfHandles, - IN PHANDLE Handles); + _In_ PVOID _context, + _In_ HDAUDIO_STREAM_STATE StreamState, + _In_ ULONG NumberOfHandles, + _In_reads_(NumberOfHandles) PHANDLE Handles); typedef VOID (NTAPI *PGET_WALL_CLOCK_REGISTER)( - IN PVOID _context, - OUT PULONG *Wallclock); - -typedef NTSTATUS + _In_ PVOID _context, + _Out_ PULONG *Wallclock); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PGET_LINK_POSITION_REGISTER)( - IN PVOID _context, - IN HANDLE Handle, - OUT PULONG *Position); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _Out_ PULONG *Position); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PREGISTER_EVENT_CALLBACK)( - IN PVOID _context, - IN PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, - IN PVOID Context, - OUT PUCHAR Tag); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, + _In_opt_ PVOID Context, + _Out_ PUCHAR Tag); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PUNREGISTER_EVENT_CALLBACK)( - IN PVOID _context, - IN UCHAR Tag); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ UCHAR Tag); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PGET_DEVICE_INFORMATION)( - IN PVOID _context, - IN OUT PHDAUDIO_DEVICE_INFORMATION DeviceInformation); + _In_ PVOID _context, + _Out_ PHDAUDIO_DEVICE_INFORMATION DeviceInformation); typedef VOID (NTAPI *PGET_RESOURCE_INFORMATION)( - IN PVOID _context, - OUT PUCHAR CodecAddress, - OUT PUCHAR FunctionGroupStartNode); + _In_ PVOID _context, + _Out_ PUCHAR CodecAddress, + _Out_ PUCHAR FunctionGroupStartNode); typedef struct _HDAUDIO_BUS_INTERFACE { USHORT Size; @@ -226,32 +250,38 @@ typedef void (NTAPI *PHDAUDIO_BDL_ISR)( - IN VOID *Context, - IN ULONG InterruptBitMask); - -typedef NTSTATUS + _In_ VOID *Context, + _In_ ULONG InterruptBitMask); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PALLOCATE_CONTIGUOUS_DMA_BUFFER)( - IN PVOID _context, - IN HANDLE Handle, + _In_ PVOID _context, + _In_ HANDLE Handle, ULONG RequestedBufferSize, - OUT PVOID *DataBuffer, - OUT PHDAUDIO_BUFFER_DESCRIPTOR *BdlBuffer); - -typedef NTSTATUS + _Out_ PVOID *DataBuffer, + _Out_ PHDAUDIO_BUFFER_DESCRIPTOR *BdlBuffer); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PFREE_CONTIGUOUS_DMA_BUFFER)( - IN PVOID _context, - IN HANDLE Handle); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PSETUP_DMA_ENGINE_WITH_BDL)( - IN PVOID _context, - IN HANDLE Handle, - IN ULONG BufferLength, - IN ULONG Lvi, - IN PHDAUDIO_BDL_ISR Isr, - IN PVOID Context, - OUT PUCHAR StreamId, - OUT PULONG FifoSize); + _In_reads_bytes_(BufferLength) PVOID _context, + _In_ HANDLE Handle, + _In_ ULONG BufferLength, + _In_ ULONG Lvi, + _In_ PHDAUDIO_BDL_ISR Isr, + _In_ PVOID Context, + _Out_ PUCHAR StreamId, + _Out_ PULONG FifoSize); typedef struct _HDAUDIO_BUS_INTERFACE_BDL { USHORT Size; @@ -276,36 +306,44 @@ PGET_RESOURCE_INFORMATION GetResourceInformation; } HDAUDIO_BUS_INTERFACE_BDL, *PHDAUDIO_BUS_INTERFACE_BDL; -typedef NTSTATUS +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION)( - IN PVOID _context, - IN HANDLE Handle, - IN ULONG NotificationCount, - IN SIZE_T RequestedBufferSize, - OUT PMDL *BufferMdl, - OUT PSIZE_T AllocatedBufferSize, - OUT PSIZE_T OffsetFromFirstPage, - OUT PUCHAR StreamId, - OUT PULONG FifoSize); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ ULONG NotificationCount, + _In_ SIZE_T RequestedBufferSize, + _Out_ PMDL *BufferMdl, + _Out_ PSIZE_T AllocatedBufferSize, + _Out_ PSIZE_T OffsetFromFirstPage, + _Out_ PUCHAR StreamId, + _Out_ PULONG FifoSize); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PFREE_DMA_BUFFER_WITH_NOTIFICATION)( - IN PVOID _context, - IN HANDLE Handle, - IN PMDL BufferMdl, - IN SIZE_T BufferSize); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ PMDL BufferMdl, + _In_ SIZE_T BufferSize); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PREGISTER_NOTIFICATION_EVENT)( - IN PVOID _context, - IN HANDLE Handle, - IN PKEVENT NotificationEvent); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ PKEVENT NotificationEvent); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PUNREGISTER_NOTIFICATION_EVENT)( - IN PVOID _context, - IN HANDLE Handle, - IN PKEVENT NotificationEvent); + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ PKEVENT NotificationEvent); typedef struct _HDAUDIO_BUS_INTERFACE_V2 { USHORT Size;

9 years, 3 months

[akhaldi] 68278: [DDK] Bring hdaudio.h to DDK formatting. NFC.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 26 16:32:40 2015 New Revision: 68278 URL: http://svn.reactos.org/svn/reactos?rev=68278&view=rev Log: [DDK] Bring hdaudio.h to DDK formatting. NFC. Modified: trunk/reactos/include/ddk/hdaudio.h Modified: trunk/reactos/include/ddk/hdaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hdaudio.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/hdaudio.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/hdaudio.h [iso-8859-1] Fri Jun 26 16:32:40 2015 @@ -6,242 +6,331 @@ #pragma warning(disable:4214) #endif -DEFINE_GUID (GUID_HDAUDIO_BUS_INTERFACE, 0xd2eaf88b, 0xab18, 0x41a8, 0xb6, 0x64, 0x8d, 0x59, 0x21, 0x67, 0x67, 0x1b); +DEFINE_GUID(GUID_HDAUDIO_BUS_INTERFACE, 0xd2eaf88b, 0xab18, 0x41a8, 0xb6, 0x64, 0x8d, 0x59, 0x21, 0x67, 0x67, 0x1b); DEFINE_GUID(GUID_HDAUDIO_BUS_INTERFACE_BDL, 0xb4d65397, 0x5634, 0x40b0, 0xb0, 0x68, 0xf5, 0xb9, 0xf8, 0xb9, 0x67, 0xa5); -DEFINE_GUID (GUID_HDAUDIO_BUS_INTERFACE_V2, 0xb52af5fb, 0x424b, 0x4bb9, 0xa1, 0x60, 0x5b, 0x38, 0xbe, 0x94, 0xe5, 0x68); -DEFINE_GUID (GUID_HDAUDIO_BUS_CLASS, 0xbbd1a745, 0xadd6, 0x4575, 0x9c, 0x2e, 0x9b, 0x42, 0x8d, 0x1c, 0x32, 0x66); +DEFINE_GUID(GUID_HDAUDIO_BUS_INTERFACE_V2, 0xb52af5fb, 0x424b, 0x4bb9, 0xa1, 0x60, 0x5b, 0x38, 0xbe, 0x94, 0xe5, 0x68); +DEFINE_GUID(GUID_HDAUDIO_BUS_CLASS, 0xbbd1a745, 0xadd6, 0x4575, 0x9c, 0x2e, 0x9b, 0x42, 0x8d, 0x1c, 0x32, 0x66); #ifndef _HDAUDIO_CODEC_TRANSFER_ #define _HDAUDIO_CODEC_TRANSFER_ -typedef struct _HDAUDIO_CODEC_COMMAND -{ - union - { - struct - { - ULONG Data : 8; - ULONG VerbId : 12; - ULONG Node : 8; - ULONG CodecAddress : 4; +typedef struct _HDAUDIO_CODEC_COMMAND { + union { + struct { + ULONG Data:8; + ULONG VerbId:12; + ULONG Node:8; + ULONG CodecAddress:4; } Verb8; - struct - { - ULONG Data : 16; - ULONG VerbId : 4; - ULONG Node : 8; - ULONG CodecAddress : 4; + struct { + ULONG Data:16; + ULONG VerbId:4; + ULONG Node:8; + ULONG CodecAddress:4; } Verb16; ULONG Command; }; } HDAUDIO_CODEC_COMMAND, *PHDAUDIO_CODEC_COMMAND; -typedef struct _HDAUDIO_CODEC_RESPONSE -{ - union - { - struct - { - union - { - struct - { - ULONG Response : 26; - ULONG Tag : 6; +typedef struct _HDAUDIO_CODEC_RESPONSE { + union { + struct { + union { + struct { + ULONG Response:26; + ULONG Tag:6; } Unsolicited; ULONG Response; }; - ULONG SDataIn : 4; - ULONG IsUnsolicitedResponse : 1; + ULONG SDataIn:4; + ULONG IsUnsolicitedResponse:1; ULONG :25; - ULONG HasFifoOverrun : 1; - ULONG IsValid : 1; + ULONG HasFifoOverrun:1; + ULONG IsValid:1; }; ULONGLONG CompleteResponse; }; } HDAUDIO_CODEC_RESPONSE, *PHDAUDIO_CODEC_RESPONSE; -typedef struct _HDAUDIO_CODEC_TRANSFER -{ - HDAUDIO_CODEC_COMMAND Output; +typedef struct _HDAUDIO_CODEC_TRANSFER { + HDAUDIO_CODEC_COMMAND Output; HDAUDIO_CODEC_RESPONSE Input; } HDAUDIO_CODEC_TRANSFER, *PHDAUDIO_CODEC_TRANSFER; -#endif - -typedef struct _HDAUDIO_STREAM_FORMAT -{ - ULONG SampleRate; - USHORT ValidBitsPerSample; - USHORT ContainerSize; - USHORT NumberOfChannels; + +#endif /* _HDAUDIO_CODEC_TRANSFER_ */ + +typedef struct _HDAUDIO_STREAM_FORMAT { + ULONG SampleRate; + USHORT ValidBitsPerSample; + USHORT ContainerSize; + USHORT NumberOfChannels; } HDAUDIO_STREAM_FORMAT, *PHDAUDIO_STREAM_FORMAT; -typedef struct _HDAUDIO_CONVERTER_FORMAT -{ - union - { - struct - { - USHORT NumberOfChannels : 4; - USHORT BitsPerSample : 3; - USHORT : 1; - USHORT SampleRate : 7; - USHORT StreamType : 1; +typedef struct _HDAUDIO_CONVERTER_FORMAT { + union { + struct { + USHORT NumberOfChannels:4; + USHORT BitsPerSample:3; + USHORT :1; + USHORT SampleRate:7; + USHORT StreamType:1; }; - USHORT ConverterFormat; + USHORT ConverterFormat; }; } HDAUDIO_CONVERTER_FORMAT, *PHDAUDIO_CONVERTER_FORMAT; -typedef enum _HDAUDIO_STREAM_STATE -{ +typedef enum _HDAUDIO_STREAM_STATE { ResetState = 0, - StopState = 1, + StopState = 1, PauseState = 1, - RunState = 2 + RunState = 2 } HDAUDIO_STREAM_STATE, *PHDAUDIO_STREAM_STATE; -typedef VOID (NTAPI *PHDAUDIO_TRANSFER_COMPLETE_CALLBACK)(HDAUDIO_CODEC_TRANSFER *, PVOID); - -typedef VOID (NTAPI *PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK)(HDAUDIO_CODEC_RESPONSE, PVOID); - -typedef struct _HDAUDIO_DEVICE_INFORMATION -{ - USHORT Size; // size of this structure - USHORT DeviceVersion; // maj.min (maj is high byte, min is low byte) - USHORT DriverVersion; // maj.min (maj is high byte, min is low byte) - USHORT CodecsDetected; // mask of codecs present. Bit number == SDI line number - BOOLEAN IsStripingSupported; // TRUE if striping (2 SDO lines) is supported +typedef VOID +(NTAPI *PHDAUDIO_TRANSFER_COMPLETE_CALLBACK)( + HDAUDIO_CODEC_TRANSFER *, + PVOID); + +typedef VOID +(NTAPI *PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK)( + HDAUDIO_CODEC_RESPONSE, + PVOID); + +typedef struct _HDAUDIO_DEVICE_INFORMATION { + USHORT Size; /* size of this structure */ + USHORT DeviceVersion; /* maj.min (maj is high byte, min is low byte) */ + USHORT DriverVersion; /* maj.min (maj is high byte, min is low byte) */ + USHORT CodecsDetected; /* mask of codecs present. Bit number == SDI line number */ + BOOLEAN IsStripingSupported; /* TRUE if striping (2 SDO lines) is supported */ } HDAUDIO_DEVICE_INFORMATION, *PHDAUDIO_DEVICE_INFORMATION; -typedef struct _HDAUDIO_BUFFER_DESCRIPTOR -{ - PHYSICAL_ADDRESS Address; - ULONG Length; - ULONG InterruptOnCompletion; +typedef struct _HDAUDIO_BUFFER_DESCRIPTOR { + PHYSICAL_ADDRESS Address; + ULONG Length; + ULONG InterruptOnCompletion; } HDAUDIO_BUFFER_DESCRIPTOR, *PHDAUDIO_BUFFER_DESCRIPTOR; - -typedef NTSTATUS (NTAPI *PTRANSFER_CODEC_VERBS) (IN PVOID _context, IN ULONG Count, IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, IN PVOID Context); -typedef NTSTATUS (NTAPI *PALLOCATE_CAPTURE_DMA_ENGINE) (IN PVOID _context, IN UCHAR CodecAddress, IN PHDAUDIO_STREAM_FORMAT StreamFormat, OUT PHANDLE Handle, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); -typedef NTSTATUS (NTAPI *PALLOCATE_RENDER_DMA_ENGINE) (IN PVOID _context, IN PHDAUDIO_STREAM_FORMAT StreamFormat, IN BOOLEAN Stripe, OUT PHANDLE Handle, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); -typedef NTSTATUS (NTAPI *PCHANGE_BANDWIDTH_ALLOCATION) (IN PVOID _context, IN HANDLE Handle, IN PHDAUDIO_STREAM_FORMAT StreamFormat, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); -typedef NTSTATUS (NTAPI *PALLOCATE_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle, IN SIZE_T RequestedBufferSize, OUT PMDL *BufferMdl, OUT PSIZE_T AllocatedBufferSize, OUT PUCHAR StreamId, OUT PULONG FifoSize); -typedef NTSTATUS (NTAPI *PFREE_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle); -typedef NTSTATUS (NTAPI *PFREE_DMA_ENGINE) (IN PVOID _context, IN HANDLE Handle); -typedef NTSTATUS (NTAPI *PSET_DMA_ENGINE_STATE) (IN PVOID _context, IN HDAUDIO_STREAM_STATE StreamState, IN ULONG NumberOfHandles, IN PHANDLE Handles); -typedef VOID (NTAPI *PGET_WALL_CLOCK_REGISTER) (IN PVOID _context, OUT PULONG *Wallclock); -typedef NTSTATUS (NTAPI *PGET_LINK_POSITION_REGISTER) (IN PVOID _context, IN HANDLE Handle, OUT PULONG *Position); -typedef NTSTATUS (NTAPI *PREGISTER_EVENT_CALLBACK) (IN PVOID _context, IN PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, IN PVOID Context, OUT PUCHAR Tag); -typedef NTSTATUS (NTAPI *PUNREGISTER_EVENT_CALLBACK) (IN PVOID _context, IN UCHAR Tag); -typedef NTSTATUS (NTAPI *PGET_DEVICE_INFORMATION) (IN PVOID _context, IN OUT PHDAUDIO_DEVICE_INFORMATION DeviceInformation); -typedef VOID (NTAPI *PGET_RESOURCE_INFORMATION) (IN PVOID _context, OUT PUCHAR CodecAddress, OUT PUCHAR FunctionGroupStartNode); - -typedef struct _HDAUDIO_BUS_INTERFACE -{ - USHORT Size; - USHORT Version; - PVOID Context; - PINTERFACE_REFERENCE InterfaceReference; - PINTERFACE_DEREFERENCE InterfaceDereference; - - PTRANSFER_CODEC_VERBS TransferCodecVerbs; - PALLOCATE_CAPTURE_DMA_ENGINE AllocateCaptureDmaEngine; - PALLOCATE_RENDER_DMA_ENGINE AllocateRenderDmaEngine; - PCHANGE_BANDWIDTH_ALLOCATION ChangeBandwidthAllocation; - PALLOCATE_DMA_BUFFER AllocateDmaBuffer; - PFREE_DMA_BUFFER FreeDmaBuffer; - PFREE_DMA_ENGINE FreeDmaEngine; - PSET_DMA_ENGINE_STATE SetDmaEngineState; - PGET_WALL_CLOCK_REGISTER GetWallClockRegister; - PGET_LINK_POSITION_REGISTER GetLinkPositionRegister; - PREGISTER_EVENT_CALLBACK RegisterEventCallback; - PUNREGISTER_EVENT_CALLBACK UnregisterEventCallback; - PGET_DEVICE_INFORMATION GetDeviceInformation; - PGET_RESOURCE_INFORMATION GetResourceInformation; +typedef NTSTATUS +(NTAPI *PTRANSFER_CODEC_VERBS)( + IN PVOID _context, + IN ULONG Count, + IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, + IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, + IN PVOID Context); + +typedef NTSTATUS +(NTAPI *PALLOCATE_CAPTURE_DMA_ENGINE)( + IN PVOID _context, + IN UCHAR CodecAddress, + IN PHDAUDIO_STREAM_FORMAT StreamFormat, + OUT PHANDLE Handle, + OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); + +typedef NTSTATUS +(NTAPI *PALLOCATE_RENDER_DMA_ENGINE)( + IN PVOID _context, + IN PHDAUDIO_STREAM_FORMAT StreamFormat, + IN BOOLEAN Stripe, + OUT PHANDLE Handle, + OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); + +typedef NTSTATUS +(NTAPI *PCHANGE_BANDWIDTH_ALLOCATION)( + IN PVOID _context, + IN HANDLE Handle, + IN PHDAUDIO_STREAM_FORMAT StreamFormat, + OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); + +typedef NTSTATUS +(NTAPI *PALLOCATE_DMA_BUFFER)( + IN PVOID _context, + IN HANDLE Handle, + IN SIZE_T RequestedBufferSize, + OUT PMDL *BufferMdl, + OUT PSIZE_T AllocatedBufferSize, + OUT PUCHAR StreamId, + OUT PULONG FifoSize); + +typedef NTSTATUS +(NTAPI *PFREE_DMA_BUFFER)( + IN PVOID _context, + IN HANDLE Handle); + +typedef NTSTATUS +(NTAPI *PFREE_DMA_ENGINE)( + IN PVOID _context, + IN HANDLE Handle); + +typedef NTSTATUS +(NTAPI *PSET_DMA_ENGINE_STATE)( + IN PVOID _context, + IN HDAUDIO_STREAM_STATE StreamState, + IN ULONG NumberOfHandles, + IN PHANDLE Handles); + +typedef VOID +(NTAPI *PGET_WALL_CLOCK_REGISTER)( + IN PVOID _context, + OUT PULONG *Wallclock); + +typedef NTSTATUS +(NTAPI *PGET_LINK_POSITION_REGISTER)( + IN PVOID _context, + IN HANDLE Handle, + OUT PULONG *Position); + +typedef NTSTATUS +(NTAPI *PREGISTER_EVENT_CALLBACK)( + IN PVOID _context, + IN PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, + IN PVOID Context, + OUT PUCHAR Tag); + +typedef NTSTATUS +(NTAPI *PUNREGISTER_EVENT_CALLBACK)( + IN PVOID _context, + IN UCHAR Tag); + +typedef NTSTATUS +(NTAPI *PGET_DEVICE_INFORMATION)( + IN PVOID _context, + IN OUT PHDAUDIO_DEVICE_INFORMATION DeviceInformation); + +typedef VOID +(NTAPI *PGET_RESOURCE_INFORMATION)( + IN PVOID _context, + OUT PUCHAR CodecAddress, + OUT PUCHAR FunctionGroupStartNode); + +typedef struct _HDAUDIO_BUS_INTERFACE { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PTRANSFER_CODEC_VERBS TransferCodecVerbs; + PALLOCATE_CAPTURE_DMA_ENGINE AllocateCaptureDmaEngine; + PALLOCATE_RENDER_DMA_ENGINE AllocateRenderDmaEngine; + PCHANGE_BANDWIDTH_ALLOCATION ChangeBandwidthAllocation; + PALLOCATE_DMA_BUFFER AllocateDmaBuffer; + PFREE_DMA_BUFFER FreeDmaBuffer; + PFREE_DMA_ENGINE FreeDmaEngine; + PSET_DMA_ENGINE_STATE SetDmaEngineState; + PGET_WALL_CLOCK_REGISTER GetWallClockRegister; + PGET_LINK_POSITION_REGISTER GetLinkPositionRegister; + PREGISTER_EVENT_CALLBACK RegisterEventCallback; + PUNREGISTER_EVENT_CALLBACK UnregisterEventCallback; + PGET_DEVICE_INFORMATION GetDeviceInformation; + PGET_RESOURCE_INFORMATION GetResourceInformation; } HDAUDIO_BUS_INTERFACE, *PHDAUDIO_BUS_INTERFACE; -typedef void (NTAPI *PHDAUDIO_BDL_ISR) (IN VOID *Context, IN ULONG InterruptBitMask); - -typedef NTSTATUS (NTAPI *PALLOCATE_CONTIGUOUS_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle, - ULONG RequestedBufferSize, OUT PVOID *DataBuffer, OUT PHDAUDIO_BUFFER_DESCRIPTOR *BdlBuffer); -typedef NTSTATUS (NTAPI *PFREE_CONTIGUOUS_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle); -typedef NTSTATUS (NTAPI *PSETUP_DMA_ENGINE_WITH_BDL) (IN PVOID _context, IN HANDLE Handle, IN ULONG BufferLength, - IN ULONG Lvi, IN PHDAUDIO_BDL_ISR Isr, IN PVOID Context, OUT PUCHAR StreamId, OUT PULONG FifoSize); - -typedef struct _HDAUDIO_BUS_INTERFACE_BDL -{ - USHORT Size; - USHORT Version; - PVOID Context; - PINTERFACE_REFERENCE InterfaceReference; - PINTERFACE_DEREFERENCE InterfaceDereference; - - PTRANSFER_CODEC_VERBS TransferCodecVerbs; - PALLOCATE_CAPTURE_DMA_ENGINE AllocateCaptureDmaEngine; - PALLOCATE_RENDER_DMA_ENGINE AllocateRenderDmaEngine; - PCHANGE_BANDWIDTH_ALLOCATION ChangeBandwidthAllocation; +typedef void +(NTAPI *PHDAUDIO_BDL_ISR)( + IN VOID *Context, + IN ULONG InterruptBitMask); + +typedef NTSTATUS +(NTAPI *PALLOCATE_CONTIGUOUS_DMA_BUFFER)( + IN PVOID _context, + IN HANDLE Handle, + ULONG RequestedBufferSize, + OUT PVOID *DataBuffer, + OUT PHDAUDIO_BUFFER_DESCRIPTOR *BdlBuffer); + +typedef NTSTATUS +(NTAPI *PFREE_CONTIGUOUS_DMA_BUFFER)( + IN PVOID _context, + IN HANDLE Handle); + +typedef NTSTATUS +(NTAPI *PSETUP_DMA_ENGINE_WITH_BDL)( + IN PVOID _context, + IN HANDLE Handle, + IN ULONG BufferLength, + IN ULONG Lvi, + IN PHDAUDIO_BDL_ISR Isr, + IN PVOID Context, + OUT PUCHAR StreamId, + OUT PULONG FifoSize); + +typedef struct _HDAUDIO_BUS_INTERFACE_BDL { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PTRANSFER_CODEC_VERBS TransferCodecVerbs; + PALLOCATE_CAPTURE_DMA_ENGINE AllocateCaptureDmaEngine; + PALLOCATE_RENDER_DMA_ENGINE AllocateRenderDmaEngine; + PCHANGE_BANDWIDTH_ALLOCATION ChangeBandwidthAllocation; PALLOCATE_CONTIGUOUS_DMA_BUFFER AllocateContiguousDmaBuffer; - PSETUP_DMA_ENGINE_WITH_BDL SetupDmaEngineWithBdl; - PFREE_CONTIGUOUS_DMA_BUFFER FreeContiguousDmaBuffer; - PFREE_DMA_ENGINE FreeDmaEngine; - PSET_DMA_ENGINE_STATE SetDmaEngineState; - PGET_WALL_CLOCK_REGISTER GetWallClockRegister; - PGET_LINK_POSITION_REGISTER GetLinkPositionRegister; - PREGISTER_EVENT_CALLBACK RegisterEventCallback; - PUNREGISTER_EVENT_CALLBACK UnregisterEventCallback; - PGET_DEVICE_INFORMATION GetDeviceInformation; - PGET_RESOURCE_INFORMATION GetResourceInformation; + PSETUP_DMA_ENGINE_WITH_BDL SetupDmaEngineWithBdl; + PFREE_CONTIGUOUS_DMA_BUFFER FreeContiguousDmaBuffer; + PFREE_DMA_ENGINE FreeDmaEngine; + PSET_DMA_ENGINE_STATE SetDmaEngineState; + PGET_WALL_CLOCK_REGISTER GetWallClockRegister; + PGET_LINK_POSITION_REGISTER GetLinkPositionRegister; + PREGISTER_EVENT_CALLBACK RegisterEventCallback; + PUNREGISTER_EVENT_CALLBACK UnregisterEventCallback; + PGET_DEVICE_INFORMATION GetDeviceInformation; + PGET_RESOURCE_INFORMATION GetResourceInformation; } HDAUDIO_BUS_INTERFACE_BDL, *PHDAUDIO_BUS_INTERFACE_BDL; -typedef NTSTATUS (NTAPI *PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION) (IN PVOID _context, - IN HANDLE Handle, - IN ULONG NotificationCount, - IN SIZE_T RequestedBufferSize, - OUT PMDL *BufferMdl, - OUT PSIZE_T AllocatedBufferSize, - OUT PSIZE_T OffsetFromFirstPage, - OUT PUCHAR StreamId, - OUT PULONG FifoSize); - -typedef NTSTATUS (NTAPI *PFREE_DMA_BUFFER_WITH_NOTIFICATION) (IN PVOID _context, - IN HANDLE Handle, - IN PMDL BufferMdl, - IN SIZE_T BufferSize); - -typedef NTSTATUS (NTAPI *PREGISTER_NOTIFICATION_EVENT) (IN PVOID _context, - IN HANDLE Handle, - IN PKEVENT NotificationEvent); - -typedef NTSTATUS (NTAPI *PUNREGISTER_NOTIFICATION_EVENT) (IN PVOID _context, - IN HANDLE Handle, - IN PKEVENT NotificationEvent); - -typedef struct _HDAUDIO_BUS_INTERFACE_V2 -{ - USHORT Size; - USHORT Version; - PVOID Context; - PINTERFACE_REFERENCE InterfaceReference; - PINTERFACE_DEREFERENCE InterfaceDereference; - - PTRANSFER_CODEC_VERBS TransferCodecVerbs; - PALLOCATE_CAPTURE_DMA_ENGINE AllocateCaptureDmaEngine; - PALLOCATE_RENDER_DMA_ENGINE AllocateRenderDmaEngine; - PCHANGE_BANDWIDTH_ALLOCATION ChangeBandwidthAllocation; - PALLOCATE_DMA_BUFFER AllocateDmaBuffer; - PFREE_DMA_BUFFER FreeDmaBuffer; - PFREE_DMA_ENGINE FreeDmaEngine; - PSET_DMA_ENGINE_STATE SetDmaEngineState; - PGET_WALL_CLOCK_REGISTER GetWallClockRegister; - PGET_LINK_POSITION_REGISTER GetLinkPositionRegister; - PREGISTER_EVENT_CALLBACK RegisterEventCallback; - PUNREGISTER_EVENT_CALLBACK UnregisterEventCallback; - PGET_DEVICE_INFORMATION GetDeviceInformation; - PGET_RESOURCE_INFORMATION GetResourceInformation; - PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION AllocateDmaBufferWithNotification; - PFREE_DMA_BUFFER_WITH_NOTIFICATION FreeDmaBufferWithNotification; - PREGISTER_NOTIFICATION_EVENT RegisterNotificationEvent; - PUNREGISTER_NOTIFICATION_EVENT UnregisterNotificationEvent; +typedef NTSTATUS +(NTAPI *PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION)( + IN PVOID _context, + IN HANDLE Handle, + IN ULONG NotificationCount, + IN SIZE_T RequestedBufferSize, + OUT PMDL *BufferMdl, + OUT PSIZE_T AllocatedBufferSize, + OUT PSIZE_T OffsetFromFirstPage, + OUT PUCHAR StreamId, + OUT PULONG FifoSize); + +typedef NTSTATUS +(NTAPI *PFREE_DMA_BUFFER_WITH_NOTIFICATION)( + IN PVOID _context, + IN HANDLE Handle, + IN PMDL BufferMdl, + IN SIZE_T BufferSize); + +typedef NTSTATUS +(NTAPI *PREGISTER_NOTIFICATION_EVENT)( + IN PVOID _context, + IN HANDLE Handle, + IN PKEVENT NotificationEvent); + +typedef NTSTATUS +(NTAPI *PUNREGISTER_NOTIFICATION_EVENT)( + IN PVOID _context, + IN HANDLE Handle, + IN PKEVENT NotificationEvent); + +typedef struct _HDAUDIO_BUS_INTERFACE_V2 { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PTRANSFER_CODEC_VERBS TransferCodecVerbs; + PALLOCATE_CAPTURE_DMA_ENGINE AllocateCaptureDmaEngine; + PALLOCATE_RENDER_DMA_ENGINE AllocateRenderDmaEngine; + PCHANGE_BANDWIDTH_ALLOCATION ChangeBandwidthAllocation; + PALLOCATE_DMA_BUFFER AllocateDmaBuffer; + PFREE_DMA_BUFFER FreeDmaBuffer; + PFREE_DMA_ENGINE FreeDmaEngine; + PSET_DMA_ENGINE_STATE SetDmaEngineState; + PGET_WALL_CLOCK_REGISTER GetWallClockRegister; + PGET_LINK_POSITION_REGISTER GetLinkPositionRegister; + PREGISTER_EVENT_CALLBACK RegisterEventCallback; + PUNREGISTER_EVENT_CALLBACK UnregisterEventCallback; + PGET_DEVICE_INFORMATION GetDeviceInformation; + PGET_RESOURCE_INFORMATION GetResourceInformation; + PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION AllocateDmaBufferWithNotification; + PFREE_DMA_BUFFER_WITH_NOTIFICATION FreeDmaBufferWithNotification; + PREGISTER_NOTIFICATION_EVENT RegisterNotificationEvent; + PUNREGISTER_NOTIFICATION_EVENT UnregisterNotificationEvent; } HDAUDIO_BUS_INTERFACE_V2, *PHDAUDIO_BUS_INTERFACE_V2; #ifdef _MSC_VER @@ -249,5 +338,4 @@ #pragma warning(default:4214) #endif -#endif // _HDAUDIO_H_ - +#endif /* _HDAUDIO_H_ */

9 years, 3 months

← Newer
1
2
3
4
5
6
7
8
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2015