Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[tkreuzer] 48338: [FREELDR] Experimental patch to get stabs symbols into untripped freeldr.sys

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 28 23:12:17 2010 New Revision: 48338 URL: http://svn.reactos.org/svn/reactos?rev=48338&view=rev Log: [FREELDR] Experimental patch to get stabs symbols into untripped freeldr.sys Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk [iso-8859-1] Wed Jul 28 23:12:17 2010 @@ -44,6 +44,14 @@ *(SORT(.rdata$*)) *(.eh_frame) } + .stab BLOCK(__section_alignment__) (NOLOAD) : + { + [ .stab ] + } + .stabstr BLOCK(__section_alignment__) (NOLOAD) : + { + [ .stabstr ] + } } Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Wed Jul 28 23:12:17 2010 @@ -16,4 +16,5 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> + <linkerflag>-gstabs+</linkerflag> </module>

14 years, 4 months

[tkreuzer] 48337: reduce diff to trunk

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 28 22:59:33 2010 New Revision: 48337 URL: http://svn.reactos.org/svn/reactos?rev=48337&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Jul 28 22:59:33 2010 @@ -373,19 +373,20 @@ VOID MiInitializePageTable() { - ULONG64 PageFrameOffset; + ULONG64 PxePhysicalAddress; MMPTE TmplPte, *Pte; + PFN_NUMBER PxePfn; /* HACK: don't use freeldr debug print anymore */ //FrLdrDbgPrint = NoDbgPrint; /* Get current directory base */ - MmSystemPageDirectory[0] = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber; - PageFrameOffset = MmSystemPageDirectory[0] << PAGE_SHIFT; - ASSERT(PageFrameOffset == __readcr3()); + PxePfn = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber; + PxePhysicalAddress = PxePfn << PAGE_SHIFT; + ASSERT(PxePhysicalAddress == __readcr3()); /* Set directory base for the system process */ - PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameOffset; + PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PxePhysicalAddress; /* Enable global pages */ __writecr4(__readcr4() | CR4_PGE);

14 years, 4 months

[akhaldi] 48336: [CMAKE] - We do have oldnames lib now. - Add proper psdk dependency for libxml2.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 28 22:01:07 2010 New Revision: 48336 URL: http://svn.reactos.org/svn/reactos?rev=48336&view=rev Log: [CMAKE] - We do have oldnames lib now. - Add proper psdk dependency for libxml2. Modified: branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libx… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Wed Jul 28 22:01:07 2010 @@ -3,8 +3,6 @@ add_definitions(-D__MINGW32__ -DLIBXML_STATIC -D_REENTRANT -DHAVE_WIN32_THREADS -D_MBCS -D_WINDOWS -DWIN32 -DHAVE_CONFIG_H) add_definitions(-D_DLL -D__USE_CRTIMP) -# FIXME: workarounds until we have a proper oldnames library -add_definitions(-Dgetcwd=_getcwd -Dclose=_close -Dwrite=_write -Dread=_read -Dopen=_open) file(GLOB_RECURSE SOURCE "*.c") LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/runsuite.c) @@ -35,3 +33,5 @@ LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/xmlint.c) add_library(libxml2 ${SOURCE}) +target_link_libraries(libxml2 oldnames) +add_dependencies(libxml2 psdk)

14 years, 4 months

[akhaldi] 48335: [CMAKE] - Add mingw libs to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 28 21:52:04 2010 New Revision: 48335 URL: http://svn.reactos.org/svn/reactos?rev=48335&view=rev Log: [CMAKE] - Add mingw libs to build. Added: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/CMak… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] Wed Jul 28 21:52:04 2010 @@ -9,5 +9,5 @@ add_subdirectory(libsamplerate) add_subdirectory(libwine) add_subdirectory(libxml2) -#add_subdirectory(mingw) # Multiple targets, watch out for isstartuplib="true" crt="..." +add_subdirectory(mingw) add_subdirectory(zlib) Added: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Wed Jul 28 21:52:04 2010 @@ -1,0 +1,68 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/mingw-w64) + +add_definitions(-D_CRTBLD -Wno-main) + +set(MINGW_COMMON_SOURCE + _newmode.c + atonexit.c + binmode.c + charmax.c + cinitexe.c + CRT_fp10.c + CRT_fp8.c + CRT_glob.c + crt_handler.c + dllentry.c + gccmain.c + gs_support.c + merr.c + mingw_helpers.c + natstart.c + pesect.c + pseudo-reloc.c + pseudo-reloc-list.c + tlsmcrt.c + tlssup.c + tlsthrd.c + txtmode.c + wildcard.c + xncommod.c + xthdloc.c + xtxtmode.c + ofmt_stub.c + cxa_pure_virtual.c +) + +add_library(mingw_common ${MINGW_COMMON_SOURCE}) +target_link_libraries(mingw_common oldnames) + +set_property(TARGET mingw_common PROPERTY COMPILE_DEFINITIONS _M_CEE_PURE) + +add_dependencies(mingw_common psdk) + + +add_library(mingw_main crt0_c.c crtexe.c dllargv.c) +set_property(TARGET mingw_main PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP) +add_dependencies(mingw_main psdk) + +add_library(mingw_wmain crt0_c.c crtexe.c dllargv.c) +set_property(TARGET mingw_wmain PROPERTY COMPILE_DEFINITIONS WPRFLAG UNICODE _UNICODE) +add_dependencies(mingw_wmain psdk) + +add_library(mingw_dllmain crtdll.c dllargv.c) +add_dependencies(mingw_dllmain psdk) + +ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a + COMMAND ${MINGW_PREFIX}dlltool --def ${REACTOS_SOURCE_DIR}/lib/3rdparty/mingw/moldname-msvcrt.def --kill-at --output-lib ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a + COMMAND ${MINGW_PREFIX}ar -rc ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a +) + +SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a PROPERTIES GENERATED TRUE) + +ADD_CUSTOM_TARGET(oldnames ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw/oldnames.a) + +add_library(getopt getopt.c) +set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP) +add_dependencies(getopt psdk) Propchange: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[dreimer] 48334: Bug 5531: [PATCH] regedit: cut, copy, paste, etc. on hexedit by Katayama Hirofumi

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 28 19:13:24 2010 New Revision: 48334 URL: http://svn.reactos.org/svn/reactos?rev=48334&view=rev Log: Bug 5531: [PATCH] regedit: cut, copy, paste, etc. on hexedit by Katayama Hirofumi Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/main.h trunk/reactos/base/applications/regedit/resource.h trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -587,8 +587,8 @@ } else pt.x = pt.y = 0; - } - ClientToScreen(pChildWnd->hListWnd, &pt); + ClientToScreen(pChildWnd->hListWnd, &pt); + } if(i == -1) { TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -47,8 +47,10 @@ INT SelStart; INT SelEnd; - BOOL SelOnField; } HEXEDIT_DATA, *PHEXEDIT_DATA; + +static const TCHAR ClipboardFormatName[] = TEXT("RegEdit_HexData"); +static UINT ClipboardFormatID = 0; /* hit test codes */ #define HEHT_LEFTMARGIN (0x1) @@ -66,6 +68,8 @@ RegisterHexEditorClass(HINSTANCE hInstance) { WNDCLASSEX WndClass; + + ClipboardFormatID = RegisterClipboardFormat(ClipboardFormatName); ZeroMemory(&WndClass, sizeof(WNDCLASSEX)); WndClass.cbSize = sizeof(WNDCLASSEX); @@ -218,7 +222,7 @@ if(ScrollPos + First == 0) { /* draw address */ - _stprintf(addr, _T("%04X"), 0); + wsprintf(addr, TEXT("%04X"), 0); TextOut(hDC, hed->LeftMargin, First * hed->LineHeight, addr, 4); } } @@ -240,7 +244,7 @@ dx = hed->LeftMargin; /* draw address */ - _stprintf(addr, _T("%04lX"), linestart); + wsprintf(addr, TEXT("%04lX"), linestart); TextOut(hDC, dx, dy, addr, 4); dx += ((4 + hed->AddressSpacing) * hed->CharWidth); @@ -260,7 +264,7 @@ rct.left += dh; rct.right += dh; - _stprintf(hex, _T("%02X"), *(current++)); + wsprintf(hex, TEXT("%02X"), *(current++)); if (i0 <= i && i < i1) { rct2.left = dx; @@ -275,7 +279,7 @@ } else ExtTextOut(hDC, dx, dy, ETO_OPAQUE, &rct, hex, 2, NULL); - dx += dh; + dx += dh; i++; } @@ -285,8 +289,8 @@ i = isave; for(x = 0; x < hed->ColumnsPerLine && current < end; x++) { - _stprintf(hex, _T("%C"), *(current++)); - hex[0] = ((hex[0] & _T('\x007f')) >= _T(' ') ? hex[0] : _T('.')); + wsprintf(hex, _T("%C"), *(current++)); + hex[0] = ((hex[0] & _T('\x007f')) >= _T(' ') ? hex[0] : _T('.')); if (i0 <= i && i < i1) { rct2.left = dx; @@ -300,7 +304,7 @@ } else TextOut(hDC, dx, dy, hex, 1); - dx += hed->CharWidth; + dx += hed->CharWidth; i++; } @@ -413,6 +417,149 @@ EditPos->x = (tmp == 0 ? hed->ColumnsPerLine : tmp); } return Index; +} + +static VOID +HEXEDIT_Copy(PHEXEDIT_DATA hed) +{ + PBYTE pb, buf; + UINT cb; + INT i0, i1; + HGLOBAL hGlobal; + + if (hed->SelStart < hed->SelEnd) + { + i0 = hed->SelStart; + i1 = hed->SelEnd; + } + else + { + i0 = hed->SelEnd; + i1 = hed->SelStart; + } + + cb = i1 - i0; + if (cb == 0) + return; + + hGlobal = GlobalAlloc(GHND | GMEM_SHARE, cb + sizeof(DWORD)); + if (hGlobal == NULL) + return; + + pb = GlobalLock(hGlobal); + if (pb) + { + *(PDWORD)pb = cb; + pb += sizeof(DWORD); + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + CopyMemory(pb, buf + i0, cb); + LocalUnlock(hed->hBuffer); + } + GlobalUnlock(hGlobal); + + if (OpenClipboard(hed->hWndSelf)) + { + EmptyClipboard(); + SetClipboardData(ClipboardFormatID, hGlobal); + CloseClipboard(); + } + } + else + GlobalFree(hGlobal); +} + +static VOID +HEXEDIT_Delete(PHEXEDIT_DATA hed) +{ + PBYTE buf; + INT i0, i1; + UINT bufsize; + + if (hed->SelStart < hed->SelEnd) + { + i0 = hed->SelStart; + i1 = hed->SelEnd; + } + else + { + i0 = hed->SelEnd; + i1 = hed->SelStart; + } + + if (i0 != i1) + { + bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + i0, buf + i1, bufsize - i1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - (i1 - i0)); + hed->InMid = FALSE; + hed->Index = hed->SelStart = hed->SelEnd = i0; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + } +} + +static VOID +HEXEDIT_Paste(PHEXEDIT_DATA hed) +{ + HGLOBAL hGlobal; + UINT bufsize; + PBYTE pb, buf; + DWORD cb; + + HEXEDIT_Delete(hed); + bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + + if (OpenClipboard(hed->hWndSelf)) + { + hGlobal = GetClipboardData(ClipboardFormatID); + if (hGlobal != NULL) + { + pb = (PBYTE) GlobalLock(hGlobal); + cb = *(PDWORD) pb; + pb += sizeof(DWORD); + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize + cb); + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index + cb, buf + hed->Index, + bufsize - hed->Index); + CopyMemory(buf + hed->Index, pb, cb); + LocalUnlock(hed->hBuffer); + } + GlobalUnlock(hGlobal); + } + CloseClipboard(); + } + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); +} + +static VOID +HEXEDIT_Cut(PHEXEDIT_DATA hed) +{ + HEXEDIT_Copy(hed); + HEXEDIT_Delete(hed); +} + +static VOID +HEXEDIT_SelectAll(PHEXEDIT_DATA hed) +{ + INT bufsize; + + bufsize = (hed->hBuffer ? (INT) LocalSize(hed->hBuffer) : 0); + hed->Index = hed->SelStart = 0; + hed->SelEnd = bufsize; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); } /*** Control specific messages ************************************************/ @@ -808,19 +955,18 @@ if (GetAsyncKeyState(VK_SHIFT) < 0) { - if (hed->SelOnField) + if (hed->EditingField) hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_HEXDUMP, &EditPos, &NewField); else hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_ASCIIDUMP, &EditPos, &NewField); hed->SelEnd = hed->Index; - hed->EditingField = hed->SelOnField; } else { Hit = HEXEDIT_HitRegionTest(hed, Pt); hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, Hit, &EditPos, &NewField); hed->SelStart = hed->SelEnd = hed->Index; - hed->SelOnField = hed->EditingField = NewField; + hed->EditingField = NewField; SetCapture(hed->hWndSelf); } hed->CaretCol = EditPos.x; @@ -839,7 +985,7 @@ POINT EditPos; if (GetCapture() == hed->hWndSelf) { - if (hed->SelOnField) + if (hed->EditingField) hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_HEXDUMP, &EditPos, &NewField); else hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_ASCIIDUMP, &EditPos, &NewField); @@ -860,7 +1006,7 @@ POINT EditPos; if (GetCapture() == hed->hWndSelf) { - if (hed->SelOnField) + if (hed->EditingField) hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_HEXDUMP, &EditPos, &NewField); else hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_ASCIIDUMP, &EditPos, &NewField); @@ -900,8 +1046,51 @@ switch(VkCode) { + case 'X': + if (GetAsyncKeyState(VK_SHIFT) >= 0 && + GetAsyncKeyState(VK_CONTROL) < 0 && hed->SelStart != hed->SelEnd) + HEXEDIT_Cut(hed); + else + return TRUE; + break; + + case 'C': + if (GetAsyncKeyState(VK_SHIFT) >= 0 && + GetAsyncKeyState(VK_CONTROL) < 0 && hed->SelStart != hed->SelEnd) + HEXEDIT_Copy(hed); + else + return TRUE; + break; + + case 'V': + if (GetAsyncKeyState(VK_SHIFT) >= 0 && GetAsyncKeyState(VK_CONTROL) < 0) + HEXEDIT_Paste(hed); + else + return TRUE; + break; + + case 'A': + if (GetAsyncKeyState(VK_SHIFT) >= 0 && GetAsyncKeyState(VK_CONTROL) < 0) + HEXEDIT_SelectAll(hed); + else + return TRUE; + break; + + case VK_INSERT: + if (hed->SelStart != hed->SelEnd) + { + if (GetAsyncKeyState(VK_SHIFT) >= 0 && GetAsyncKeyState(VK_CONTROL) < 0) + HEXEDIT_Copy(hed); + } + if (GetAsyncKeyState(VK_SHIFT) < 0 && GetAsyncKeyState(VK_CONTROL) >= 0) + HEXEDIT_Paste(hed); + break; + case VK_DELETE: - if (hed->SelStart != hed->SelEnd) + if (GetAsyncKeyState(VK_SHIFT) < 0 && GetAsyncKeyState(VK_CONTROL) >= 0 && + hed->SelStart != hed->SelEnd) + HEXEDIT_Copy(hed); + if (i0 != i1) { buf = (PBYTE) LocalLock(hed->hBuffer); if (buf) @@ -946,7 +1135,7 @@ break; case VK_BACK: - if (hed->SelStart != hed->SelEnd) + if (i0 != i1) { buf = (PBYTE) LocalLock(hed->hBuffer); if (buf) @@ -986,6 +1175,8 @@ hed->CaretCol = hed->Index % hed->ColumnsPerLine; hed->CaretLine = hed->Index / hed->ColumnsPerLine; } + else + return TRUE; HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); hed->InMid = FALSE; } @@ -1056,6 +1247,9 @@ InvalidateRect(hed->hWndSelf, NULL, TRUE); HEXEDIT_MoveCaret(hed, TRUE); break; + + default: + return TRUE; } return FALSE; @@ -1185,6 +1379,40 @@ return 0; } +static VOID +HEXEDIT_WM_CONTEXTMENU(PHEXEDIT_DATA hed, INT x, INT y) +{ + HMENU hMenu; + RECT rc; + + if (x == -1 && y == -1) + { + GetWindowRect(hed->hWndSelf, &rc); + x = rc.left; + y = rc.top; + } + + hMenu = GetSubMenu(hPopupMenus, PM_HEXEDIT); + if (hed->SelStart == hed->SelEnd) + { + EnableMenuItem(hMenu, ID_HEXEDIT_CUT, MF_GRAYED); + EnableMenuItem(hMenu, ID_HEXEDIT_COPY, MF_GRAYED); + EnableMenuItem(hMenu, ID_HEXEDIT_PASTE, MF_GRAYED); + EnableMenuItem(hMenu, ID_HEXEDIT_DELETE, MF_GRAYED); + } + else + { + EnableMenuItem(hMenu, ID_HEXEDIT_CUT, MF_ENABLED); + EnableMenuItem(hMenu, ID_HEXEDIT_COPY, MF_ENABLED); + EnableMenuItem(hMenu, ID_HEXEDIT_PASTE, MF_ENABLED); + EnableMenuItem(hMenu, ID_HEXEDIT_DELETE, MF_ENABLED); + } + + SetForegroundWindow(hed->hWndSelf); + TrackPopupMenu(hMenu, TPM_RIGHTBUTTON, x, y, 0, hed->hWndSelf, NULL); + PostMessage(hed->hWndSelf, WM_NULL, 0, 0); +} + INT_PTR CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1291,11 +1519,32 @@ break; case WM_CONTEXTMENU: - /* FIXME: Implement Cut, Copy, Paste, Delete and Select All */ + HEXEDIT_WM_CONTEXTMENU(hed, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; case WM_COMMAND: - /* FIXME: Implement Cut, Copy, Paste, Delete and Select All */ + switch(LOWORD(wParam)) + { + case ID_HEXEDIT_CUT: + HEXEDIT_Cut(hed); + break; + + case ID_HEXEDIT_COPY: + HEXEDIT_Copy(hed); + break; + + case ID_HEXEDIT_PASTE: + HEXEDIT_Paste(hed); + break; + + case ID_HEXEDIT_DELETE: + HEXEDIT_Delete(hed); + break; + + case ID_HEXEDIT_SELECT_ALL: + HEXEDIT_SelectAll(hed); + break; + } break; } Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "&Çàïîìíÿíå ñòîéíîñòòà íà êëþ÷à", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -160,6 +160,15 @@ MENUITEM SEPARATOR MENUITEM "Z&kopírovat název klíèe", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "S&chlüsselnamen kopieren", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "&Ausschneiden", ID_HEXEDIT_CUT + MENUITEM "&Kopieren", ID_HEXEDIT_COPY + MENUITEM "&Einfügen", ID_HEXEDIT_PASTE + MENUITEM "&Löschen", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "A&lles auswählen", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "&ÁíôéãñáöÞ Ïíüìáôïò Êëåéäéïý", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -160,6 +160,15 @@ MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -165,6 +165,15 @@ MENUITEM SEPARATOR MENUITEM "&Copiar nombre de clave", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -165,6 +165,15 @@ MENUITEM SEPARATOR MENUITEM "&Copier le nom de la clé", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -163,6 +163,15 @@ MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "&Copy Nama Kunci", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -165,6 +165,15 @@ MENUITEM SEPARATOR MENUITEM "&Copia il nome della chiave", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -160,6 +160,15 @@ MENUITEM SEPARATOR MENUITEM "L[¼ÌRs[(&C)", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "Øèæè(&C)", ID_HEXEDIT_CUT + MENUITEM "Rs[(&C)", ID_HEXEDIT_COPY + MENUITEM "\\èt¯(&P)", ID_HEXEDIT_PASTE + MENUITEM "í(&D)", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "·×ÄIð(&A)", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -147,6 +147,15 @@ MENUITEM SEPARATOR MENUITEM "Å° ÀÌ¸§ º¹»ç(&C)", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "&Kopier nøkkelnavn", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -167,6 +167,15 @@ MENUITEM SEPARATOR MENUITEM "&Kopiuj nazwê klucza", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -163,6 +163,15 @@ MENUITEM SEPARATOR MENUITEM "&Copiar nome da chave", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -163,6 +163,15 @@ MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "&Êîïèðîâàòü èìÿ êëþ÷à", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -147,6 +147,15 @@ MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -160,6 +160,15 @@ MENUITEM SEPARATOR MENUITEM "&Kopiera nyckelnamn", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -163,6 +163,15 @@ MENUITEM SEPARATOR MENUITEM "&Êîï³þâàòè ³ì'ÿ ðîçä³ëó", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -162,6 +162,15 @@ MENUITEM SEPARATOR MENUITEM "¸´ÖÆÏîÃû³Æ(&C)", ID_EDIT_COPYKEYNAME END + POPUP "" + BEGIN + MENUITEM "C&ut", ID_HEXEDIT_CUT + MENUITEM "&Copy", ID_HEXEDIT_COPY + MENUITEM "&Paste", ID_HEXEDIT_PASTE + MENUITEM "&Delete", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + END END Modified: trunk/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/main.h [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -35,6 +35,7 @@ #define PM_MODIFYVALUE 0 #define PM_NEW 1 #define PM_TREECONTEXT 2 +#define PM_HEXEDIT 3 #define MAX_NEW_KEY_LEN 128 Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -108,6 +108,11 @@ #define ID_REGISTRY_PRINTSUBTREE 32832 #define ID_REGISTRY_PRINTERSETUP 32833 #define ID_REGISTRY_SAVESUBTREEAS 32834 +#define ID_HEXEDIT_CUT 32835 +#define ID_HEXEDIT_COPY 32836 +#define ID_HEXEDIT_PASTE 32837 +#define ID_HEXEDIT_DELETE 32838 +#define ID_HEXEDIT_SELECT_ALL 32839 #define IDS_LICENSE 32835 #define IDS_ERROR 32836 #define IDS_BAD_VALUE 32837 @@ -203,6 +208,7 @@ #define IDC_LOOKAT_DATA 2016 #define IDC_MATCHSTRING 2017 #define IDC_MATCHCASE 2018 + #define IDS_FINISHEDFIND 2019 #define ID_FAVORITES_MIN 2100 @@ -210,4 +216,5 @@ #define ID_ACCEL 3000 + #define IDC_STATIC -1 Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Wed Jul 28 19:13:24 2010 @@ -540,15 +540,16 @@ TCHAR szNewKey[128]; LPCTSTR pszKeyPath; int iIndex = 1; - HKEY hRootKey; - HKEY hKey = NULL; - HKEY hNewKey = NULL; + LONG nResult; + HKEY hRootKey = NULL, hKey = NULL, hNewKey = NULL; BOOL bSuccess = FALSE; DWORD dwDisposition; HTREEITEM hNewItem; - pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, hItem, &hRootKey); - if (RegOpenKey(hRootKey, pszKeyPath, &hKey) != ERROR_SUCCESS) + pszKeyPath = GetItemPath(hwndTV, hItem, &hRootKey); + if (pszKeyPath[0] == TEXT('\0')) + hKey = hRootKey; + else if (RegOpenKey(hRootKey, pszKeyPath, &hKey) != ERROR_SUCCESS) goto done; if (LoadString(hInst, IDS_NEW_KEY, szNewKeyFormat, sizeof(szNewKeyFormat) / sizeof(szNewKeyFormat[0])) <= 0) @@ -557,13 +558,20 @@ /* Need to create a new key with a unique name */ do { - _sntprintf(szNewKey, sizeof(szNewKey) / sizeof(szNewKey[0]), szNewKeyFormat, iIndex++); - RegCreateKeyEx(hKey, szNewKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hNewKey, &dwDisposition); - if (hNewKey && (dwDisposition == REG_OPENED_EXISTING_KEY)) + wsprintf(szNewKey, szNewKeyFormat, iIndex++); + nResult = RegCreateKeyEx(hKey, szNewKey, 0, NULL, 0, KEY_WRITE, NULL, &hNewKey, &dwDisposition); + if (hNewKey && dwDisposition == REG_OPENED_EXISTING_KEY) { RegCloseKey(hNewKey); hNewKey = NULL; } + else if (!hNewKey) + { + TCHAR sz[256]; + wsprintf(sz, TEXT("Cannot create new key!\n\nError Code: %d"), nResult); + MessageBox(hFrameWnd, sz, NULL, MB_ICONERROR); + goto done; + } } while(!hNewKey); @@ -578,7 +586,7 @@ bSuccess = TRUE; done: - if (hKey) + if (hKey != hRootKey && hKey) RegCloseKey(hKey); if (hNewKey) RegCloseKey(hNewKey);

14 years, 4 months

[akhaldi] 48333: [CMAKE] - Fix stdole2.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 28 17:00:50 2010 New Revision: 48333 URL: http://svn.reactos.org/svn/reactos?rev=48333&view=rev Log: [CMAKE] - Fix stdole2. Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Wed Jul 28 17:00:50 2010 @@ -37,6 +37,7 @@ LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dbinit.idl) LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/vmrender.idl) LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/sesprp.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/stdole2.idl) LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/rstloc.idl) LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/rstbas.idl) LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/rstinf.idl) @@ -50,3 +51,13 @@ MACRO_ADD_PSDK_INTERFACES(${SOURCE}) ADD_CUSTOM_TARGET(psdk ALL DEPENDS ${PSDK_HEADERS}) + +ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/include/psdk/stdole2.tlb + COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -t -T ${REACTOS_BINARY_DIR}/include/psdk/stdole2.tlb ${REACTOS_SOURCE_DIR}/include/psdk/stdole2.idl + DEPENDS native-widl +) + +SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/include/psdk/stdole2.tlb PROPERTIES GENERATED TRUE) + +ADD_CUSTOM_TARGET(stdole2 ALL DEPENDS ${REACTOS_BINARY_DIR}/include/psdk/stdole2.tlb)

14 years, 4 months

[akhaldi] 48332: [CMAKE] - Add sound drivers libs to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 28 16:24:00 2010 New Revision: 48332 URL: http://svn.reactos.org/svn/reactos?rev=48332&view=rev Log: [CMAKE] - Add sound drivers libs to build. Added: branches/cmake-bringup/lib/drivers/sound/CMakeLists.txt (with props) branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt (with props) branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt (with props) branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt (with props) branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt (with props) branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt (with props) branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt (with props) branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/drivers/CMakeLists.txt Modified: branches/cmake-bringup/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/CMake… ============================================================================== --- branches/cmake-bringup/lib/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/CMakeLists.txt [iso-8859-1] Wed Jul 28 16:24:00 2010 @@ -3,4 +3,4 @@ add_subdirectory(csq) add_subdirectory(ip) add_subdirectory(oskittcp) -#add_subdirectory(sound) +add_subdirectory(sound) Added: branches/cmake-bringup/lib/drivers/sound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/sound/CMakeLists.txt [iso-8859-1] Wed Jul 28 16:24:00 2010 @@ -1,0 +1,8 @@ + +add_subdirectory(legacy) +add_subdirectory(mmebuddy) +add_subdirectory(mment4) +add_subdirectory(mmixer) +add_subdirectory(shared) +add_subdirectory(soundblaster) +add_subdirectory(uartmidi) Propchange: branches/cmake-bringup/lib/drivers/sound/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt [iso-8859-1] Wed Jul 28 16:24:00 2010 @@ -1,0 +1,11 @@ + +add_definitions(-D__NTDRIVER__) +add_definitions(-DKERNEL) + +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(audioleg ${SOURCE}) +add_dependencies(audioleg bugcodes) Propchange: branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt [iso-8859-1] Wed Jul 28 16:24:00 2010 @@ -1,0 +1,10 @@ + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DNDEBUG=1) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(mmebuddy ${SOURCE}) +add_dependencies(mmebuddy psdk) Propchange: branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt [iso-8859-1] Wed Jul 28 16:24:00 2010 @@ -1,0 +1,10 @@ + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DDEBUG_NT4=1) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(mment4 ${SOURCE}) +add_dependencies(mment4 psdk) Propchange: branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt [iso-8859-1] Wed Jul 28 16:24:00 2010 @@ -1,0 +1,11 @@ + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DNDEBUG=1) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(mmixer ${SOURCE}) +add_dependencies(mmixer bugcodes) + Propchange: branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt [iso-8859-1] Wed Jul 28 16:24:00 2010 @@ -1,0 +1,9 @@ + +add_definitions(-D__NTDRIVER__) +add_definitions(-DKERNEL) + +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) + +add_library(audio time.c) +add_dependencies(audio bugcodes) Propchange: branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] Wed Jul 28 16:24:00 2010 @@ -1,0 +1,12 @@ + +add_definitions(-D__NTDRIVER__) +add_definitions(-DKERNEL) + +include_directories(.) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(soundblaster ${SOURCE}) +add_dependencies(soundblaster bugcodes) + Propchange: branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt [iso-8859-1] Wed Jul 28 16:24:00 2010 @@ -1,0 +1,9 @@ + +add_definitions(-D__NTDRIVER__) +add_definitions(-DKERNEL) + +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) + +add_library(uartmidi midiuart.c) +add_dependencies(uartmidi bugcodes) Propchange: branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[akhaldi] 48331: [CMAKE] - Add ip and oskittcp to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 28 14:59:02 2010 New Revision: 48331 URL: http://svn.reactos.org/svn/reactos?rev=48331&view=rev Log: [CMAKE] - Add ip and oskittcp to build. Added: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt (with props) branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/drivers/CMakeLists.txt Modified: branches/cmake-bringup/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/CMake… ============================================================================== --- branches/cmake-bringup/lib/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/CMakeLists.txt [iso-8859-1] Wed Jul 28 14:59:02 2010 @@ -1,6 +1,6 @@ add_subdirectory(chew) add_subdirectory(csq) -#add_subdirectory(ip) -#add_subdirectory(oskittcp) +add_subdirectory(ip) +add_subdirectory(oskittcp) #add_subdirectory(sound) Added: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/ip/CM… ============================================================================== --- branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Wed Jul 28 14:59:02 2010 @@ -1,0 +1,18 @@ + +add_definitions(-D__NTDRIVER__) + +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) + +foreach(arg ${defines}) + set(result_defs "${result_defs} -D${arg}") +endforeach(arg ${defines}) + +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>") + +file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/network/${ARCH}/checksum.S) +file(GLOB_RECURSE SOURCE "*.c") + +add_library(ip ${ARCH_SOURCE} ${SOURCE}) +add_dependencies(ip bugcodes) + Propchange: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/oskit… ============================================================================== --- branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt [iso-8859-1] Wed Jul 28 14:59:02 2010 @@ -1,0 +1,18 @@ + +include_directories(BEFORE include/freebsd) +include_directories(BEFORE include/freebsd/sys/include) +include_directories(BEFORE include/freebsd/src/sys) +include_directories(BEFORE include/freebsd/dev/include) +include_directories(BEFORE include/freebsd/net/include) + +include_directories(include) + +add_definitions(-D__NTDRIVER__) +add_definitions(-DKERNEL) +add_definitions(-DOSKIT) + +file(GLOB_RECURSE SOURCE "oskittcp/*.c") + +add_library(oskittcp ${SOURCE}) +add_dependencies(oskittcp bugcodes) + Propchange: branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[akhaldi] 48330: [DXSDK] - atsmedia.h : Add proper header inclusion and apply a consistent formatting. - bdamedia.h : Rename BDAMEDIA_H__ to _BDAMEDIA_, add some missing inclusions, add __MINGW_EXTENSION and apply a consistent formatting. - bdatypes.h : Apply a consistent formatting.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 28 13:59:28 2010 New Revision: 48330 URL: http://svn.reactos.org/svn/reactos?rev=48330&view=rev Log: [DXSDK] - atsmedia.h : Add proper header inclusion and apply a consistent formatting. - bdamedia.h : Rename BDAMEDIA_H__ to _BDAMEDIA_, add some missing inclusions, add __MINGW_EXTENSION and apply a consistent formatting. - bdatypes.h : Apply a consistent formatting. Modified: trunk/reactos/include/dxsdk/atsmedia.h trunk/reactos/include/dxsdk/bdamedia.h trunk/reactos/include/dxsdk/bdatypes.h Modified: trunk/reactos/include/dxsdk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/atsmedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/atsmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/atsmedia.h [iso-8859-1] Wed Jul 28 13:59:28 2010 @@ -18,19 +18,14 @@ #pragma once -#if !defined(_BDAMEDIA_) - #error BDAMEDIA.H must be included before ATSCMEDIA.H -#endif - -#if !defined(_KSMEDIA_) - #error KSMEDIA.H must be included before BDAMEDIA.H -#endif - -#if !defined(_ATSCMEDIA_) +#ifndef _ATSCMEDIA_ #define _ATSCMEDIA_ +#include <bdamedia.h> + #define BDANETWORKTYPE_ATSC DEFINE_GUIDNAMED(BDANETWORKTYPE_ATSC) -#define STATIC_BDANETWORKTYPE_ATSC 0x71985F51, 0x1CA1, 0x11D3, 0x9C, 0xC8, 0x0, 0xC0, 0x4F, 0x79, 0x71, 0xE0 +#define STATIC_BDANETWORKTYPE_ATSC \ + 0x71985F51, 0x1CA1, 0x11D3, 0x9C, 0xC8, 0x0, 0xC0, 0x4F, 0x79, 0x71, 0xE0 DEFINE_GUIDSTRUCT("71985F51-1CA1-11D3-9CC8-00C04F7971E0", BDANETWORKTYPE_ATSC); -#endif +#endif /* _ATSCMEDIA_ */ Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Wed Jul 28 13:59:28 2010 @@ -15,207 +15,201 @@ * */ -#ifndef BDAMEDIA_H__ -#define BDAMEDIA_H__ +#ifndef _BDAMEDIA_ +#define _BDAMEDIA_ + +#include <ksmedia.h> +#include <bdatypes.h> typedef struct _KSP_BDA_NODE_PIN { - KSPROPERTY Property; - ULONG ulNodeType; - ULONG ulInputPinId; - ULONG ulOutputPinId; + KSPROPERTY Property; + ULONG ulNodeType; + ULONG ulInputPinId; + ULONG ulOutputPinId; } KSP_BDA_NODE_PIN, *PKSP_BDA_NODE_PIN; -typedef struct _KSM_BDA_PIN -{ - KSMETHOD Method; - union - { - ULONG PinId; - ULONG PinType; - }; - ULONG Reserved; -} KSM_BDA_PIN, * PKSM_BDA_PIN; - -typedef struct _KSM_BDA_PIN_PAIR -{ - KSMETHOD Method; - union - { - ULONG InputPinId; - ULONG InputPinType; - }; - union - { - ULONG OutputPinId; - ULONG OutputPinType; - }; -} KSM_BDA_PIN_PAIR, * PKSM_BDA_PIN_PAIR; +typedef struct _KSM_BDA_PIN { + KSMETHOD Method; + __MINGW_EXTENSION union { + ULONG PinId; + ULONG PinType; + }; + ULONG Reserved; +} KSM_BDA_PIN, *PKSM_BDA_PIN; + +typedef struct _KSM_BDA_PIN_PAIR { + KSMETHOD Method; + __MINGW_EXTENSION union { + ULONG InputPinId; + ULONG InputPinType; + }; + __MINGW_EXTENSION union { + ULONG OutputPinId; + ULONG OutputPinType; + }; +} KSM_BDA_PIN_PAIR, *PKSM_BDA_PIN_PAIR; + /* ------------------------------------------------------------ BDA Topology Property Set {A14EE835-0A23-11d3-9CC7-00C04F7971E0} */ #define STATIC_KSPROPSETID_BdaTopology \ - 0xa14ee835, 0x0a23, 0x11d3, 0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + 0xa14ee835, 0x0a23, 0x11d3, 0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + DEFINE_GUIDSTRUCT("A14EE835-0A23-11d3-9CC7-00C04F7971E0", KSPROPSETID_BdaTopology); + #define KSPROPSETID_BdaTopology DEFINE_GUIDNAMED(KSPROPSETID_BdaTopology) typedef enum { - KSPROPERTY_BDA_NODE_TYPES, - KSPROPERTY_BDA_PIN_TYPES, - KSPROPERTY_BDA_TEMPLATE_CONNECTIONS, - KSPROPERTY_BDA_NODE_METHODS, - KSPROPERTY_BDA_NODE_PROPERTIES, - KSPROPERTY_BDA_NODE_EVENTS, - KSPROPERTY_BDA_CONTROLLING_PIN_ID, - KSPROPERTY_BDA_NODE_DESCRIPTORS - }KSPROPERTY_BDA_TOPOLOGY; - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_TYPES(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_TYPES,\ - (GetHandler),\ - sizeof(KSPROPERTY),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPES(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_PIN_TYPES,\ - (GetHandler),\ - sizeof(KSPROPERTY),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_TEMPLATE_CONNECTIONS(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_TEMPLATE_CONNECTIONS,\ - (GetHandler),\ - sizeof(KSPROPERTY),\ - sizeof( BDA_TEMPLATE_CONNECTION),\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_METHODS(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_METHODS,\ - (GetHandler),\ - sizeof(KSP_NODE),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_PROPERTIES(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_PROPERTIES,\ - (GetHandler),\ - sizeof(KSP_NODE),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_EVENTS(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_EVENTS,\ - (GetHandler),\ - sizeof(KSP_NODE),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_CONTROLLING_PIN_ID(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_CONTROLLING_PIN_ID,\ - (GetHandler),\ - sizeof(KSP_BDA_NODE_PIN),\ - sizeof( ULONG),\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_DESCRIPTORS,\ - (GetHandler),\ - sizeof(KSPROPERTY),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) + KSPROPERTY_BDA_NODE_TYPES, + KSPROPERTY_BDA_PIN_TYPES, + KSPROPERTY_BDA_TEMPLATE_CONNECTIONS, + KSPROPERTY_BDA_NODE_METHODS, + KSPROPERTY_BDA_NODE_PROPERTIES, + KSPROPERTY_BDA_NODE_EVENTS, + KSPROPERTY_BDA_CONTROLLING_PIN_ID, + KSPROPERTY_BDA_NODE_DESCRIPTORS +} KSPROPERTY_BDA_TOPOLOGY; + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_TYPES(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_TYPES, \ + (GetHandler), \ + sizeof(KSPROPERTY), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPES(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_PIN_TYPES, \ + (GetHandler), \ + sizeof(KSPROPERTY), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_TEMPLATE_CONNECTIONS(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_TEMPLATE_CONNECTIONS, \ + (GetHandler), \ + sizeof(KSPROPERTY), \ + sizeof( BDA_TEMPLATE_CONNECTION), \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_METHODS(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_METHODS, \ + (GetHandler), \ + sizeof(KSP_NODE), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_PROPERTIES(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_PROPERTIES, \ + (GetHandler), \ + sizeof(KSP_NODE), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_EVENTS(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_EVENTS, \ + (GetHandler), \ + sizeof(KSP_NODE), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_CONTROLLING_PIN_ID(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_CONTROLLING_PIN_ID, \ + (GetHandler), \ + sizeof(KSP_BDA_NODE_PIN), \ + sizeof( ULONG), \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_DESCRIPTORS, \ + (GetHandler), \ + sizeof(KSPROPERTY), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + /* ------------------------------------------------------------ BDA Device Configuration Method Set {71985F45-1CA1-11d3-9CC8-00C04F7971E0} */ #define STATIC_KSMETHODSETID_BdaDeviceConfiguration \ - 0x71985f45, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + 0x71985f45, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + DEFINE_GUIDSTRUCT("71985F45-1CA1-11d3-9CC8-00C04F7971E0", KSMETHODSETID_BdaDeviceConfiguration); + #define KSMETHODSETID_BdaDeviceConfiguration DEFINE_GUIDNAMED(KSMETHODSETID_BdaDeviceConfiguration) typedef enum { - KSMETHOD_BDA_CREATE_PIN_FACTORY = 0, - KSMETHOD_BDA_DELETE_PIN_FACTORY, - KSMETHOD_BDA_CREATE_TOPOLOGY + KSMETHOD_BDA_CREATE_PIN_FACTORY = 0, + KSMETHOD_BDA_DELETE_PIN_FACTORY, + KSMETHOD_BDA_CREATE_TOPOLOGY } KSMETHOD_BDA_DEVICE_CONFIGURATION; -#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_PIN_FACTORY(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_CREATE_PIN_FACTORY,\ - KSMETHOD_TYPE_READ,\ - (MethodHandler),\ - sizeof(KSM_BDA_PIN),\ - sizeof(ULONG),\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_DELETE_PIN_FACTORY(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_DELETE_PIN_FACTORY,\ - KSMETHOD_TYPE_NONE,\ - (MethodHandler),\ - sizeof(KSM_BDA_PIN),\ - 0,\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_TOPOLOGY(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_CREATE_TOPOLOGY,\ - KSMETHOD_TYPE_WRITE,\ - (MethodHandler),\ - sizeof(KSM_BDA_PIN_PAIR),\ - 0,\ - SupportHandler) +#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_PIN_FACTORY(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_CREATE_PIN_FACTORY, \ + KSMETHOD_TYPE_READ, \ + (MethodHandler), \ + sizeof(KSM_BDA_PIN), \ + sizeof(ULONG), \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_DELETE_PIN_FACTORY(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_DELETE_PIN_FACTORY, \ + KSMETHOD_TYPE_NONE, \ + (MethodHandler), \ + sizeof(KSM_BDA_PIN), \ + 0, \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_TOPOLOGY(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_CREATE_TOPOLOGY, \ + KSMETHOD_TYPE_WRITE, \ + (MethodHandler), \ + sizeof(KSM_BDA_PIN_PAIR), \ + 0, \ + SupportHandler) + /* ------------------------------------------------------------ BDA Pin Control Property {0DED49D5-A8B7-4d5d-97A1-12B0C195874D} */ #define STATIC_KSPROPSETID_BdaPinControl \ - 0xded49d5, 0xa8b7, 0x4d5d, 0x97, 0xa1, 0x12, 0xb0, 0xc1, 0x95, 0x87, 0x4d + 0xded49d5, 0xa8b7, 0x4d5d, 0x97, 0xa1, 0x12, 0xb0, 0xc1, 0x95, 0x87, 0x4d + DEFINE_GUIDSTRUCT("0DED49D5-A8B7-4d5d-97A1-12B0C195874D", KSPROPSETID_BdaPinControl); + #define KSPROPSETID_BdaPinControl DEFINE_GUIDNAMED(KSPROPSETID_BdaPinControl) typedef enum { - KSPROPERTY_BDA_PIN_ID = 0, - KSPROPERTY_BDA_PIN_TYPE + KSPROPERTY_BDA_PIN_ID = 0, + KSPROPERTY_BDA_PIN_TYPE } KSPROPERTY_BDA_PIN_CONTROL; -#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_ID(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_PIN_ID,\ - (GetHandler),\ - sizeof( KSPROPERTY),\ - sizeof( ULONG),\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPE(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_PIN_TYPE,\ - (GetHandler),\ - sizeof( KSPROPERTY),\ - sizeof( ULONG),\ - FALSE,\ - NULL, 0, NULL, NULL, 0) +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_ID(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_PIN_ID, \ + (GetHandler), \ + sizeof( KSPROPERTY), \ + sizeof( ULONG), \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPE(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_PIN_TYPE, \ + (GetHandler), \ + sizeof( KSPROPERTY), \ + sizeof( ULONG), \ + FALSE, \ + NULL, 0, NULL, NULL, 0) /* ------------------------------------------------------------ @@ -223,198 +217,214 @@ */ #define STATIC_KSMETHODSETID_BdaChangeSync \ - 0xfd0a5af3, 0xb41d, 0x11d2, {0x9c, 0x95, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0} + 0xfd0a5af3, 0xb41d, 0x11d2, {0x9c, 0x95, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0} + DEFINE_GUIDSTRUCT("FD0A5AF3-B41D-11d2-9C95-00C04F7971E0", KSMETHODSETID_BdaChangeSync); + #define KSMETHODSETID_BdaChangeSync DEFINE_GUIDNAMED(KSMETHODSETID_BdaChangeSync) typedef enum { - KSMETHOD_BDA_START_CHANGES = 0, - KSMETHOD_BDA_CHECK_CHANGES, - KSMETHOD_BDA_COMMIT_CHANGES, - KSMETHOD_BDA_GET_CHANGE_STATE + KSMETHOD_BDA_START_CHANGES = 0, + KSMETHOD_BDA_CHECK_CHANGES, + KSMETHOD_BDA_COMMIT_CHANGES, + KSMETHOD_BDA_GET_CHANGE_STATE } KSMETHOD_BDA_CHANGE_SYNC; -#define DEFINE_KSMETHOD_ITEM_BDA_START_CHANGES(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_START_CHANGES,\ - KSMETHOD_TYPE_NONE,\ - (MethodHandler),\ - sizeof(KSMETHOD),\ - 0,\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_CHECK_CHANGES(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_CHECK_CHANGES,\ - KSMETHOD_TYPE_NONE,\ - (MethodHandler),\ - sizeof(KSMETHOD),\ - 0,\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_COMMIT_CHANGES(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_COMMIT_CHANGES,\ - KSMETHOD_TYPE_NONE,\ - (MethodHandler),\ - sizeof(KSMETHOD),\ - 0,\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_GET_CHANGE_STATE(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_GET_CHANGE_STATE,\ - KSMETHOD_TYPE_READ,\ - (MethodHandler),\ - sizeof(KSMETHOD),\ - 0,\ - SupportHandler) +#define DEFINE_KSMETHOD_ITEM_BDA_START_CHANGES(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_START_CHANGES, \ + KSMETHOD_TYPE_NONE, \ + (MethodHandler), \ + sizeof(KSMETHOD), \ + 0, \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_CHECK_CHANGES(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_CHECK_CHANGES, \ + KSMETHOD_TYPE_NONE, \ + (MethodHandler), \ + sizeof(KSMETHOD), \ + 0, \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_COMMIT_CHANGES(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_COMMIT_CHANGES, \ + KSMETHOD_TYPE_NONE, \ + (MethodHandler), \ + sizeof(KSMETHOD), \ + 0, \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_GET_CHANGE_STATE(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_GET_CHANGE_STATE, \ + KSMETHOD_TYPE_READ, \ + (MethodHandler), \ + sizeof(KSMETHOD), \ + 0, \ + SupportHandler) #define STATIC_KSPROPSETID_BdaFrequencyFilter \ - 0x71985f47, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + 0x71985f47, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + DEFINE_GUIDSTRUCT("71985F47-1CA1-11d3-9CC8-00C04F7971E0", KSPROPSETID_BdaFrequencyFilter); + #define KSPROPSETID_BdaFrequencyFilter DEFINE_GUIDNAMED(KSPROPSETID_BdaFrequencyFilter) typedef enum { - KSPROPERTY_BDA_RF_TUNER_FREQUENCY = 0, - KSPROPERTY_BDA_RF_TUNER_POLARITY, - KSPROPERTY_BDA_RF_TUNER_RANGE, - KSPROPERTY_BDA_RF_TUNER_TRANSPONDER, - KSPROPERTY_BDA_RF_TUNER_BANDWIDTH, - KSPROPERTY_BDA_RF_TUNER_FREQUENCY_MULTIPLIER, - KSPROPERTY_BDA_RF_TUNER_CAPS, - KSPROPERTY_BDA_RF_TUNER_SCAN_STATUS, - KSPROPERTY_BDA_RF_TUNER_STANDARD, - KSPROPERTY_BDA_RF_TUNER_STANDARD_MODE -}KSPROPERTY_BDA_FREQUENCY_FILTER; - + KSPROPERTY_BDA_RF_TUNER_FREQUENCY = 0, + KSPROPERTY_BDA_RF_TUNER_POLARITY, + KSPROPERTY_BDA_RF_TUNER_RANGE, + KSPROPERTY_BDA_RF_TUNER_TRANSPONDER, + KSPROPERTY_BDA_RF_TUNER_BANDWIDTH, + KSPROPERTY_BDA_RF_TUNER_FREQUENCY_MULTIPLIER, + KSPROPERTY_BDA_RF_TUNER_CAPS, + KSPROPERTY_BDA_RF_TUNER_SCAN_STATUS, + KSPROPERTY_BDA_RF_TUNER_STANDARD, + KSPROPERTY_BDA_RF_TUNER_STANDARD_MODE +} KSPROPERTY_BDA_FREQUENCY_FILTER; #define STATIC_KSPROPSETID_BdaDigitalDemodulator \ - 0xef30f379, 0x985b, 0x4d10, 0xb6, 0x40, 0xa7, 0x9d, 0x5e, 0x4, 0xe1, 0xe0 + 0xef30f379, 0x985b, 0x4d10, 0xb6, 0x40, 0xa7, 0x9d, 0x5e, 0x4, 0xe1, 0xe0 + DEFINE_GUIDSTRUCT("EF30F379-985B-4d10-B640-A79D5E04E1E0", KSPROPSETID_BdaDigitalDemodulator); + #define KSPROPSETID_BdaDigitalDemodulator DEFINE_GUIDNAMED(KSPROPSETID_BdaDigitalDemodulator) typedef enum { - KSPROPERTY_BDA_MODULATION_TYPE = 0, - KSPROPERTY_BDA_INNER_FEC_TYPE, - KSPROPERTY_BDA_INNER_FEC_RATE, - KSPROPERTY_BDA_OUTER_FEC_TYPE, - KSPROPERTY_BDA_OUTER_FEC_RATE, - KSPROPERTY_BDA_SYMBOL_RATE, - KSPROPERTY_BDA_SPECTRAL_INVERSION, - KSPROPERTY_BDA_GUARD_INTERVAL, - KSPROPERTY_BDA_TRANSMISSION_MODE, - KSPROPERTY_BDA_ROLL_OFF, - KSPROPERTY_BDA_PILOT, - KSPROPERTY_BDA_SIGNALTIMEOUTS -}KSPROPERTY_BDA_DIGITAL_DEMODULATOR; + KSPROPERTY_BDA_MODULATION_TYPE = 0, + KSPROPERTY_BDA_INNER_FEC_TYPE, + KSPROPERTY_BDA_INNER_FEC_RATE, + KSPROPERTY_BDA_OUTER_FEC_TYPE, + KSPROPERTY_BDA_OUTER_FEC_RATE, + KSPROPERTY_BDA_SYMBOL_RATE, + KSPROPERTY_BDA_SPECTRAL_INVERSION, + KSPROPERTY_BDA_GUARD_INTERVAL, + KSPROPERTY_BDA_TRANSMISSION_MODE, + KSPROPERTY_BDA_ROLL_OFF, + KSPROPERTY_BDA_PILOT, + KSPROPERTY_BDA_SIGNALTIMEOUTS +} KSPROPERTY_BDA_DIGITAL_DEMODULATOR; #define STATIC_KSPROPSETID_BdaLNBInfo \ - 0x992cf102, 0x49f9, 0x4719, 0xa6, 0x64, 0xc4, 0xf2, 0x3e, 0x24, 0x8, 0xf4 + 0x992cf102, 0x49f9, 0x4719, 0xa6, 0x64, 0xc4, 0xf2, 0x3e, 0x24, 0x8, 0xf4 + DEFINE_GUIDSTRUCT("992CF102-49F9-4719-A664-C4F23E2408F4", KSPROPSETID_BdaLNBInfo); + #define KSPROPSETID_BdaLNBInfo DEFINE_GUIDNAMED(KSPROPSETID_BdaLNBInfo) typedef enum { - KSPROPERTY_BDA_LNB_LOF_LOW_BAND = 0, - KSPROPERTY_BDA_LNB_LOF_HIGH_BAND, - KSPROPERTY_BDA_LNB_SWITCH_FREQUENCY -}KSPROPERTY_BDA_LNB_INFO; + KSPROPERTY_BDA_LNB_LOF_LOW_BAND = 0, + KSPROPERTY_BDA_LNB_LOF_HIGH_BAND, + KSPROPERTY_BDA_LNB_SWITCH_FREQUENCY +} KSPROPERTY_BDA_LNB_INFO; #define STATIC_KSPROPSETID_BdaSignalStats \ - 0x1347d106, 0xcf3a, 0x428a, 0xa5, 0xcb, 0xac, 0xd, 0x9a, 0x2a, 0x43, 0x38 + 0x1347d106, 0xcf3a, 0x428a, 0xa5, 0xcb, 0xac, 0xd, 0x9a, 0x2a, 0x43, 0x38 + DEFINE_GUIDSTRUCT("1347D106-CF3A-428a-A5CB-AC0D9A2A4338", KSPROPSETID_BdaSignalStats); + #define KSPROPSETID_BdaSignalStats DEFINE_GUIDNAMED(KSPROPSETID_BdaSignalStats) typedef enum { - KSPROPERTY_BDA_SIGNAL_STRENGTH = 0, - KSPROPERTY_BDA_SIGNAL_QUALITY, - KSPROPERTY_BDA_SIGNAL_PRESENT, - KSPROPERTY_BDA_SIGNAL_LOCKED, - KSPROPERTY_BDA_SAMPLE_TIME -}KSPROPERTY_BDA_SIGNAL_STATS; + KSPROPERTY_BDA_SIGNAL_STRENGTH = 0, + KSPROPERTY_BDA_SIGNAL_QUALITY, + KSPROPERTY_BDA_SIGNAL_PRESENT, + KSPROPERTY_BDA_SIGNAL_LOCKED, + KSPROPERTY_BDA_SAMPLE_TIME +} KSPROPERTY_BDA_SIGNAL_STATS; typedef struct tagBDA_TRANSPORT_INFO { - ULONG ulcbPhyiscalPacket; - ULONG ulcbPhyiscalFrame; - ULONG ulcbPhyiscalFrameAlignment; - REFERENCE_TIME AvgTimePerFrame; - + ULONG ulcbPhyiscalPacket; + ULONG ulcbPhyiscalFrame; + ULONG ulcbPhyiscalFrameAlignment; + REFERENCE_TIME AvgTimePerFrame; } BDA_TRANSPORT_INFO, *PBDA_TRANSPORT_INFO; -typedef struct tagKS_DATARANGE_BDA_TRANSPORT -{ - KSDATARANGE DataRange; - BDA_TRANSPORT_INFO BdaTransportInfo; +typedef struct tagKS_DATARANGE_BDA_TRANSPORT { + KSDATARANGE DataRange; + BDA_TRANSPORT_INFO BdaTransportInfo; } KS_DATARANGE_BDA_TRANSPORT, *PKS_DATARANGE_BDA_TRANSPORT; + /* ------------------------------------------------------------ BDA Stream Format GUIDs */ #define STATIC_KSDATAFORMAT_TYPE_BDA_ANTENNA\ - 0x71985f41, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + 0x71985f41, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + DEFINE_GUIDSTRUCT("71985F41-1CA1-11d3-9CC8-00C04F7971E0", KSDATAFORMAT_TYPE_BDA_ANTENNA); + #define KSDATAFORMAT_TYPE_BDA_ANTENNA DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_BDA_ANTENNA) - #define STATIC_KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT\ - 0xf4aeb342, 0x0329, 0x4fdd, 0xa8, 0xfd, 0x4a, 0xff, 0x49, 0x26, 0xc9, 0x78 + 0xf4aeb342, 0x0329, 0x4fdd, 0xa8, 0xfd, 0x4a, 0xff, 0x49, 0x26, 0xc9, 0x78 + DEFINE_GUIDSTRUCT("F4AEB342-0329-4fdd-A8FD-4AFF4926C978", KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT); + #define KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT) - #define STATIC_KSDATAFORMAT_SPECIFIER_BDA_TRANSPORT\ - 0x8deda6fd, 0xac5f, 0x4334, 0x8e, 0xcf, 0xa4, 0xba, 0x8f, 0xa7, 0xd0, 0xf0 + 0x8deda6fd, 0xac5f, 0x4334, 0x8e, 0xcf, 0xa4, 0xba, 0x8f, 0xa7, 0xd0, 0xf0 + DEFINE_GUIDSTRUCT("8DEDA6FD-AC5F-4334-8ECF-A4BA8FA7D0F0", KSDATAFORMAT_SPECIFIER_BDA_TRANSPORT); + #define KSDATAFORMAT_SPECIFIER_BDA_TRANSPORT DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_BDA_TRANSPORT) - #define STATIC_KSDATAFORMAT_TYPE_BDA_IF_SIGNAL\ - 0x61be0b47, 0xa5eb, 0x499b, 0x9a, 0x85, 0x5b, 0x16, 0xc0, 0x7f, 0x12, 0x58 + 0x61be0b47, 0xa5eb, 0x499b, 0x9a, 0x85, 0x5b, 0x16, 0xc0, 0x7f, 0x12, 0x58 + DEFINE_GUIDSTRUCT("61BE0B47-A5EB-499b-9A85-5B16C07F1258", KSDATAFORMAT_TYPE_BDA_IF_SIGNAL); + #define KSDATAFORMAT_TYPE_BDA_IF_SIGNAL DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_BDA_IF_SIGNAL) - #define STATIC_KSDATAFORMAT_TYPE_MPEG2_SECTIONS\ - 0x455f176c, 0x4b06, 0x47ce, 0x9a, 0xef, 0x8c, 0xae, 0xf7, 0x3d, 0xf7, 0xb5 + 0x455f176c, 0x4b06, 0x47ce, 0x9a, 0xef, 0x8c, 0xae, 0xf7, 0x3d, 0xf7, 0xb5 + DEFINE_GUIDSTRUCT("455F176C-4B06-47CE-9AEF-8CAEF73DF7B5", KSDATAFORMAT_TYPE_MPEG2_SECTIONS); + #define KSDATAFORMAT_TYPE_MPEG2_SECTIONS DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_MPEG2_SECTIONS) - #define STATIC_KSDATAFORMAT_SUBTYPE_ATSC_SI\ - 0xb3c7397c, 0xd303, 0x414d, 0xb3, 0x3c, 0x4e, 0xd2, 0xc9, 0xd2, 0x97, 0x33 + 0xb3c7397c, 0xd303, 0x414d, 0xb3, 0x3c, 0x4e, 0xd2, 0xc9, 0xd2, 0x97, 0x33 + DEFINE_GUIDSTRUCT("B3C7397C-D303-414D-B33C-4ED2C9D29733", KSDATAFORMAT_SUBTYPE_ATSC_SI); + #define KSDATAFORMAT_SUBTYPE_ATSC_SI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_ATSC_SI) - #define STATIC_KSDATAFORMAT_SUBTYPE_DVB_SI\ - 0xe9dd31a3, 0x221d, 0x4adb, 0x85, 0x32, 0x9a, 0xf3, 0x9, 0xc1, 0xa4, 0x8 + 0xe9dd31a3, 0x221d, 0x4adb, 0x85, 0x32, 0x9a, 0xf3, 0x9, 0xc1, 0xa4, 0x8 + DEFINE_GUIDSTRUCT("e9dd31a3-221d-4adb-8532-9af309c1a408", KSDATAFORMAT_SUBTYPE_DVB_SI); + #define KSDATAFORMAT_SUBTYPE_DVB_SI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DVB_SI) - #define STATIC_KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_PSIP\ - 0x762e3f66, 0x336f, 0x48d1, 0xbf, 0x83, 0x2b, 0x0, 0x35, 0x2c, 0x11, 0xf0 + 0x762e3f66, 0x336f, 0x48d1, 0xbf, 0x83, 0x2b, 0x0, 0x35, 0x2c, 0x11, 0xf0 + DEFINE_GUIDSTRUCT("762E3F66-336F-48d1-BF83-2B00352C11F0", KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_PSIP); + #define KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_PSIP DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_PSIP) - #define STATIC_KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_OOB_PSIP\ - 0x951727db, 0xd2ce, 0x4528, 0x96, 0xf6, 0x33, 0x1, 0xfa, 0xbb, 0x2d, 0xe0 + 0x951727db, 0xd2ce, 0x4528, 0x96, 0xf6, 0x33, 0x1, 0xfa, 0xbb, 0x2d, 0xe0 + DEFINE_GUIDSTRUCT("951727DB-D2CE-4528-96F6-3301FABB2DE0", KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_OOB_PSIP); + #define KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_OOB_PSIP DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_OOB_PSIP) - #define STATIC_KSDATAFORMAT_SUBTYPE_ISDB_SI\ - 0x4a2eeb99, 0x6458, 0x4538, 0xb1, 0x87, 0x04, 0x01, 0x7c, 0x41, 0x41, 0x3f + 0x4a2eeb99, 0x6458, 0x4538, 0xb1, 0x87, 0x04, 0x01, 0x7c, 0x41, 0x41, 0x3f + DEFINE_GUIDSTRUCT("4a2eeb99-6458-4538-b187-04017c41413f", KSDATAFORMAT_SUBTYPE_ISDB_SI); + #define KSDATAFORMAT_SUBTYPE_ISDB_SI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_ISDB_SI) - #define STATIC_KSDATAFORMAT_SUBTYPE_PBDA_TRANSPORT_RAW\ - 0x0d7aed42, 0xcb9a, 0x11db, 0x97, 0x05, 0x00, 0x50, 0x56, 0xc0, 0x00, 0x08 + 0x0d7aed42, 0xcb9a, 0x11db, 0x97, 0x05, 0x00, 0x50, 0x56, 0xc0, 0x00, 0x08 + DEFINE_GUIDSTRUCT("0d7AED42-CB9A-11DB-9705-005056C00008", KSDATAFORMAT_SUBTYPE_PBDA_TRANSPORT_RAW); + #define KSDATAFORMAT_SUBTYPE_PBDA_TRANSPORT_RAW DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_PBDA_TRANSPORT_RAW) -#endif +#endif /* _BDAMEDIA_ */ Modified: trunk/reactos/include/dxsdk/bdatypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdatypes.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdatypes.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdatypes.h [iso-8859-1] Wed Jul 28 13:59:28 2010 @@ -16,10 +16,9 @@ */ #ifndef _BDATYPES_ - #define _BDATYPES_ 1 + #define MIN_DIMENSION 1 - #ifdef __midl #define V1_ENUM [v1_enum] @@ -27,365 +26,305 @@ #define V1_ENUM #endif -#define BDA_FREQUENCY_NOT_SET -1 -#define BDA_FREQUENCY_NOT_DEFINED 0 -#define BDA_RANGE_NOT_SET -1 -#define BDA_RANGE_NOT_DEFINED 0 -#define BDA_CHAN_BANDWITH_NOT_SET -1 -#define BDA_CHAN_BANDWITH_NOT_DEFINED 0 -#define BDA_FREQUENCY_MULTIPLIER_NOT_SET -1 +#define BDA_FREQUENCY_NOT_SET -1 +#define BDA_FREQUENCY_NOT_DEFINED 0 +#define BDA_RANGE_NOT_SET -1 +#define BDA_RANGE_NOT_DEFINED 0 +#define BDA_CHAN_BANDWITH_NOT_SET -1 +#define BDA_CHAN_BANDWITH_NOT_DEFINED 0 +#define BDA_FREQUENCY_MULTIPLIER_NOT_SET -1 #define BDA_FREQUENCY_MULTIPLIER_NOT_DEFINED 0 - -typedef struct _BDA_TEMPLATE_CONNECTION -{ - ULONG FromNodeType; - ULONG FromNodePinType; - ULONG ToNodeType; - ULONG ToNodePinType; -}BDA_TEMPLATE_CONNECTION, *PBDA_TEMPLATE_CONNECTION; - - -typedef struct _BDA_TEMPLATE_PIN_JOINT -{ - ULONG uliTemplateConnection; - ULONG ulcInstancesMax; -}BDA_TEMPLATE_PIN_JOINT, *PBDA_TEMPLATE_PIN_JOINT; - - -typedef struct tagKS_BDA_FRAME_INFO -{ - ULONG ExtendedHeaderSize; - DWORD dwFrameFlags; - ULONG ulEvent; - ULONG ulChannelNumber; - ULONG ulSubchannelNumber; - ULONG ulReason; +typedef struct _BDA_TEMPLATE_CONNECTION { + ULONG FromNodeType; + ULONG FromNodePinType; + ULONG ToNodeType; + ULONG ToNodePinType; +} BDA_TEMPLATE_CONNECTION, *PBDA_TEMPLATE_CONNECTION; + +typedef struct _BDA_TEMPLATE_PIN_JOINT { + ULONG uliTemplateConnection; + ULONG ulcInstancesMax; +} BDA_TEMPLATE_PIN_JOINT, *PBDA_TEMPLATE_PIN_JOINT; + +typedef struct tagKS_BDA_FRAME_INFO { + ULONG ExtendedHeaderSize; + DWORD dwFrameFlags; + ULONG ulEvent; + ULONG ulChannelNumber; + ULONG ulSubchannelNumber; + ULONG ulReason; } KS_BDA_FRAME_INFO, *PKS_BDA_FRAME_INFO; -typedef enum -{ - BDA_EVENT_SIGNAL_LOSS = 0, - BDA_EVENT_SIGNAL_LOCK, - BDA_EVENT_DATA_START, - BDA_EVENT_DATA_STOP, - BDA_EVENT_CHANNEL_ACQUIRED, - BDA_EVENT_CHANNEL_LOST, - BDA_EVENT_CHANNEL_SOURCE_CHANGED, - BDA_EVENT_CHANNEL_ACTIVATED, - BDA_EVENT_CHANNEL_DEACTIVATED, - BDA_EVENT_SUBCHANNEL_ACQUIRED, - BDA_EVENT_SUBCHANNEL_LOST, - BDA_EVENT_SUBCHANNEL_SOURCE_CHANGED, - BDA_EVENT_SUBCHANNEL_ACTIVATED, - BDA_EVENT_SUBCHANNEL_DEACTIVATED, - BDA_EVENT_ACCESS_GRANTED, - BDA_EVENT_ACCESS_DENIED, - BDA_EVENT_OFFER_EXTENDED, - BDA_EVENT_PURCHASE_COMPLETED, - BDA_EVENT_SMART_CARD_INSERTED, - BDA_EVENT_SMART_CARD_REMOVED +typedef enum { + BDA_EVENT_SIGNAL_LOSS = 0, + BDA_EVENT_SIGNAL_LOCK, + BDA_EVENT_DATA_START, + BDA_EVENT_DATA_STOP, + BDA_EVENT_CHANNEL_ACQUIRED, + BDA_EVENT_CHANNEL_LOST, + BDA_EVENT_CHANNEL_SOURCE_CHANGED, + BDA_EVENT_CHANNEL_ACTIVATED, + BDA_EVENT_CHANNEL_DEACTIVATED, + BDA_EVENT_SUBCHANNEL_ACQUIRED, + BDA_EVENT_SUBCHANNEL_LOST, + BDA_EVENT_SUBCHANNEL_SOURCE_CHANGED, + BDA_EVENT_SUBCHANNEL_ACTIVATED, + BDA_EVENT_SUBCHANNEL_DEACTIVATED, + BDA_EVENT_ACCESS_GRANTED, + BDA_EVENT_ACCESS_DENIED, + BDA_EVENT_OFFER_EXTENDED, + BDA_EVENT_PURCHASE_COMPLETED, + BDA_EVENT_SMART_CARD_INSERTED, + BDA_EVENT_SMART_CARD_REMOVED } BDA_EVENT_ID, *PBDA_EVENT_ID; - - -typedef struct _BDA_ETHERNET_ADDRESS -{ - BYTE rgbAddress[6]; +typedef struct _BDA_ETHERNET_ADDRESS { + BYTE rgbAddress[6]; } BDA_ETHERNET_ADDRESS, *PBDA_ETHERNET_ADDRESS; typedef struct _BDA_ETHERNET_ADDRESS_LIST { - ULONG ulcAddresses; - BDA_ETHERNET_ADDRESS rgAddressl[MIN_DIMENSION]; + ULONG ulcAddresses; + BDA_ETHERNET_ADDRESS rgAddressl[MIN_DIMENSION]; } BDA_ETHERNET_ADDRESS_LIST, *PBDA_ETHERNET_ADDRESS_LIST; -typedef enum -{ - BDA_PROMISCUOUS_MULTICAST = 0, - BDA_FILTERED_MULTICAST, - BDA_NO_MULTICAST +typedef enum { + BDA_PROMISCUOUS_MULTICAST = 0, + BDA_FILTERED_MULTICAST, + BDA_NO_MULTICAST } BDA_MULTICAST_MODE, *PBDA_MULTICAST_MODE; -typedef struct _BDA_IPv4_ADDRESS -{ - BYTE rgbAddress[4]; +typedef struct _BDA_IPv4_ADDRESS { + BYTE rgbAddress[4]; } BDA_IPv4_ADDRESS, *PBDA_IPv4_ADDRESS; -typedef struct _BDA_IPv4_ADDRESS_LIST -{ - ULONG ulcAddresses; - BDA_IPv4_ADDRESS rgAddressl[MIN_DIMENSION]; -} BDA_IPv4_ADDRESS_LIST, * PBDA_IPv4_ADDRESS_LIST; - - -typedef struct _BDA_IPv6_ADDRESS -{ - BYTE rgbAddress[6]; +typedef struct _BDA_IPv4_ADDRESS_LIST { + ULONG ulcAddresses; + BDA_IPv4_ADDRESS rgAddressl[MIN_DIMENSION]; +} BDA_IPv4_ADDRESS_LIST, *PBDA_IPv4_ADDRESS_LIST; + +typedef struct _BDA_IPv6_ADDRESS { + BYTE rgbAddress[6]; } BDA_IPv6_ADDRESS, *PBDA_IPv6_ADDRESS; -typedef struct _BDA_IPv6_ADDRESS_LIST -{ - ULONG ulcAddresses; - BDA_IPv6_ADDRESS rgAddressl[MIN_DIMENSION]; +typedef struct _BDA_IPv6_ADDRESS_LIST { + ULONG ulcAddresses; + BDA_IPv6_ADDRESS rgAddressl[MIN_DIMENSION]; } BDA_IPv6_ADDRESS_LIST, *PBDA_IPv6_ADDRESS_LIST; - -typedef enum -{ - BDA_CHANGES_COMPLETE = 0, - BDA_CHANGES_PENDING - -} BDA_CHANGE_STATE, * PBDA_CHANGE_STATE; - -typedef enum -{ - BDA_SIGNAL_UNAVAILABLE = 0, - BDA_SIGNAL_INACTIVE, - BDA_SIGNAL_ACTIVE -} BDA_SIGNAL_STATE, * PBDA_SIGNAL_STATE; - - - - - -typedef struct _BDANODE_DESCRIPTOR -{ - ULONG ulBdaNodeType; - GUID guidFunction; - GUID guidName; +typedef enum { + BDA_CHANGES_COMPLETE = 0, + BDA_CHANGES_PENDING +} BDA_CHANGE_STATE, *PBDA_CHANGE_STATE; + +typedef enum { + BDA_SIGNAL_UNAVAILABLE = 0, + BDA_SIGNAL_INACTIVE, + BDA_SIGNAL_ACTIVE +} BDA_SIGNAL_STATE, *PBDA_SIGNAL_STATE; + +typedef struct _BDANODE_DESCRIPTOR { + ULONG ulBdaNodeType; + GUID guidFunction; + GUID guidName; } BDANODE_DESCRIPTOR, *PBDANODE_DESCRIPTOR; -typedef enum -{ - MEDIA_TRANSPORT_PACKET, - MEDIA_ELEMENTARY_STREAM, - MEDIA_MPEG2_PSI, - MEDIA_TRANSPORT_PAYLOAD -} MEDIA_SAMPLE_CONTENT ; - -typedef struct _BDA_TABLE_SECTION -{ - ULONG ulPrimarySectionId; - ULONG ulSecondarySectionId; - ULONG ulcbSectionLength; - ULONG argbSectionData[MIN_DIMENSION]; +typedef enum { + MEDIA_TRANSPORT_PACKET, + MEDIA_ELEMENTARY_STREAM, + MEDIA_MPEG2_PSI, + MEDIA_TRANSPORT_PAYLOAD +} MEDIA_SAMPLE_CONTENT; + +typedef struct _BDA_TABLE_SECTION { + ULONG ulPrimarySectionId; + ULONG ulSecondarySectionId; + ULONG ulcbSectionLength; + ULONG argbSectionData[MIN_DIMENSION]; } BDA_TABLE_SECTION, *PBDA_TABLE_SECTION; - -typedef struct -{ - ULONG ulPID ; - MEDIA_SAMPLE_CONTENT MediaSampleContent ; -} PID_MAP ; - -typedef struct _BDA_PID_MAP -{ - MEDIA_SAMPLE_CONTENT MediaSampleContent; - ULONG ulcPIDs; - ULONG aulPIDs[MIN_DIMENSION]; +typedef struct { + ULONG ulPID; + MEDIA_SAMPLE_CONTENT MediaSampleContent ; +} PID_MAP; + +typedef struct _BDA_PID_MAP { + MEDIA_SAMPLE_CONTENT MediaSampleContent; + ULONG ulcPIDs; + ULONG aulPIDs[MIN_DIMENSION]; } BDA_PID_MAP, *PBDA_PID_MAP; -typedef struct _BDA_PID_UNMAP -{ - ULONG ulcPIDs; - ULONG aulPIDs[MIN_DIMENSION]; +typedef struct _BDA_PID_UNMAP { + ULONG ulcPIDs; + ULONG aulPIDs[MIN_DIMENSION]; } BDA_PID_UNMAP, *PBDA_PID_UNMAP; - -typedef enum DVBSystemType -{ - DVB_Cable, - DVB_Terrestrial, - DVB_Satellite, +typedef enum DVBSystemType { + DVB_Cable, + DVB_Terrestrial, + DVB_Satellite, } DVBSystemType; -typedef struct _BDA_CA_MODULE_UI -{ - ULONG ulFormat; - ULONG ulbcDesc; - ULONG ulDesc[MIN_DIMENSION]; +typedef struct _BDA_CA_MODULE_UI { + ULONG ulFormat; + ULONG ulbcDesc; + ULONG ulDesc[MIN_DIMENSION]; } BDA_CA_MODULE_UI, *PBDA_CA_MODULE_UI; -typedef struct _BDA_PROGRAM_PID_LIST -{ - ULONG ulProgramNumber; - ULONG ulcPIDs; - ULONG ulPID[MIN_DIMENSION]; +typedef struct _BDA_PROGRAM_PID_LIST { + ULONG ulProgramNumber; + ULONG ulcPIDs; + ULONG ulPID[MIN_DIMENSION]; } BDA_PROGRAM_PID_LIST, *PBDA_PROGRAM_PID_LIST; - -V1_ENUM enum -{ - BDA_UNDEFINED_CHANNEL = -1, +V1_ENUM enum { + BDA_UNDEFINED_CHANNEL = -1, }; -typedef V1_ENUM enum ComponentCategory -{ - CategoryNotSet = -1, - CategoryOther = 0, - CategoryVideo, - CategoryAudio, - CategoryText, - CategoryData, +typedef V1_ENUM enum ComponentCategory { + CategoryNotSet = -1, + CategoryOther = 0, + CategoryVideo, + CategoryAudio, + CategoryText, + CategoryData, } ComponentCategory; -typedef enum ComponentStatus -{ - StatusActive, - StatusInactive, - StatusUnavailable, +typedef enum ComponentStatus { + StatusActive, + StatusInactive, + StatusUnavailable, } ComponentStatus; -typedef enum ATSCComponentTypeFlags -{ - ATSCCT_AC3 = 0x00000001, +typedef enum ATSCComponentTypeFlags { + ATSCCT_AC3 = 0x00000001, } ATSCComponentTypeFlags; -typedef V1_ENUM enum MPEG2StreamType -{ - BDA_UNITIALIZED_MPEG2STREAMTYPE = -1, - Reserved1 = 0x0, - ISO_IEC_11172_2_VIDEO = Reserved1 + 1, - ISO_IEC_13818_2_VIDEO = ISO_IEC_11172_2_VIDEO + 1, - ISO_IEC_11172_3_AUDIO = ISO_IEC_13818_2_VIDEO + 1, - ISO_IEC_13818_3_AUDIO = ISO_IEC_11172_3_AUDIO + 1, - ISO_IEC_13818_1_PRIVATE_SECTION = ISO_IEC_13818_3_AUDIO + 1, - ISO_IEC_13818_1_PES = ISO_IEC_13818_1_PRIVATE_SECTION + 1, - ISO_IEC_13522_MHEG = ISO_IEC_13818_1_PES + 1, - ANNEX_A_DSM_CC = ISO_IEC_13522_MHEG + 1, - ITU_T_REC_H_222_1 = ANNEX_A_DSM_CC + 1, - ISO_IEC_13818_6_TYPE_A = ITU_T_REC_H_222_1 + 1, - ISO_IEC_13818_6_TYPE_B = ISO_IEC_13818_6_TYPE_A + 1, - ISO_IEC_13818_6_TYPE_C = ISO_IEC_13818_6_TYPE_B + 1, - ISO_IEC_13818_6_TYPE_D = ISO_IEC_13818_6_TYPE_C + 1, - ISO_IEC_13818_1_AUXILIARY = ISO_IEC_13818_6_TYPE_D + 1, - ISO_IEC_13818_1_RESERVED = ISO_IEC_13818_1_AUXILIARY + 1, - USER_PRIVATE = ISO_IEC_13818_1_RESERVED + 1 +typedef V1_ENUM enum MPEG2StreamType { + BDA_UNITIALIZED_MPEG2STREAMTYPE = -1, + Reserved1 = 0x0, + ISO_IEC_11172_2_VIDEO = Reserved1 + 1, + ISO_IEC_13818_2_VIDEO = ISO_IEC_11172_2_VIDEO + 1, + ISO_IEC_11172_3_AUDIO = ISO_IEC_13818_2_VIDEO + 1, + ISO_IEC_13818_3_AUDIO = ISO_IEC_11172_3_AUDIO + 1, + ISO_IEC_13818_1_PRIVATE_SECTION = ISO_IEC_13818_3_AUDIO + 1, + ISO_IEC_13818_1_PES = ISO_IEC_13818_1_PRIVATE_SECTION + 1, + ISO_IEC_13522_MHEG = ISO_IEC_13818_1_PES + 1, + ANNEX_A_DSM_CC = ISO_IEC_13522_MHEG + 1, + ITU_T_REC_H_222_1 = ANNEX_A_DSM_CC + 1, + ISO_IEC_13818_6_TYPE_A = ITU_T_REC_H_222_1 + 1, + ISO_IEC_13818_6_TYPE_B = ISO_IEC_13818_6_TYPE_A + 1, + ISO_IEC_13818_6_TYPE_C = ISO_IEC_13818_6_TYPE_B + 1, + ISO_IEC_13818_6_TYPE_D = ISO_IEC_13818_6_TYPE_C + 1, + ISO_IEC_13818_1_AUXILIARY = ISO_IEC_13818_6_TYPE_D + 1, + ISO_IEC_13818_1_RESERVED = ISO_IEC_13818_1_AUXILIARY + 1, + USER_PRIVATE = ISO_IEC_13818_1_RESERVED + 1 } MPEG2StreamType; -typedef struct _MPEG2_TRANSPORT_STRIDE -{ - DWORD dwOffset ; - DWORD dwPacketLength ; - DWORD dwStride ; -} MPEG2_TRANSPORT_STRIDE, *PMPEG2_TRANSPORT_STRIDE ; - - - - - -typedef V1_ENUM enum BinaryConvolutionCodeRate -{ - BDA_BCC_RATE_NOT_SET = -1, - BDA_BCC_RATE_NOT_DEFINED = 0, - BDA_BCC_RATE_1_2 = 1, - BDA_BCC_RATE_2_3, - BDA_BCC_RATE_3_4, - BDA_BCC_RATE_3_5, - BDA_BCC_RATE_4_5, - BDA_BCC_RATE_5_6, - BDA_BCC_RATE_5_11, - BDA_BCC_RATE_7_8, - BDA_BCC_RATE_MAX, +typedef struct _MPEG2_TRANSPORT_STRIDE { + DWORD dwOffset; + DWORD dwPacketLength; + DWORD dwStride; +} MPEG2_TRANSPORT_STRIDE, *PMPEG2_TRANSPORT_STRIDE; + +typedef V1_ENUM enum BinaryConvolutionCodeRate { + BDA_BCC_RATE_NOT_SET = -1, + BDA_BCC_RATE_NOT_DEFINED = 0, + BDA_BCC_RATE_1_2 = 1, + BDA_BCC_RATE_2_3, + BDA_BCC_RATE_3_4, + BDA_BCC_RATE_3_5, + BDA_BCC_RATE_4_5, + BDA_BCC_RATE_5_6, + BDA_BCC_RATE_5_11, + BDA_BCC_RATE_7_8, + BDA_BCC_RATE_MAX, } BinaryConvolutionCodeRate; -typedef V1_ENUM enum SpectralInversion -{ - BDA_SPECTRAL_INVERSION_NOT_SET = -1, - BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0, - BDA_SPECTRAL_INVERSION_AUTOMATIC = 1, - BDA_SPECTRAL_INVERSION_NORMAL, - BDA_SPECTRAL_INVERSION_INVERTED, - BDA_SPECTRAL_INVERSION_MAX +typedef V1_ENUM enum SpectralInversion { + BDA_SPECTRAL_INVERSION_NOT_SET = -1, + BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0, + BDA_SPECTRAL_INVERSION_AUTOMATIC = 1, + BDA_SPECTRAL_INVERSION_NORMAL, + BDA_SPECTRAL_INVERSION_INVERTED, + BDA_SPECTRAL_INVERSION_MAX } SpectralInversion; -typedef V1_ENUM enum FECMethod -{ - BDA_FEC_METHOD_NOT_SET = -1, - BDA_FEC_METHOD_NOT_DEFINED = 0, - BDA_FEC_VITERBI = 1, - BDA_FEC_RS_204_188, - BDA_FEC_MAX, +typedef V1_ENUM enum FECMethod { + BDA_FEC_METHOD_NOT_SET = -1, + BDA_FEC_METHOD_NOT_DEFINED = 0, + BDA_FEC_VITERBI = 1, + BDA_FEC_RS_204_188, + BDA_FEC_MAX, } FECMethod; -typedef V1_ENUM enum ModulationType -{ - BDA_MOD_NOT_SET = -1, - BDA_MOD_NOT_DEFINED = 0, - BDA_MOD_16QAM = 1, - BDA_MOD_32QAM, - BDA_MOD_64QAM, - BDA_MOD_80QAM, - BDA_MOD_96QAM, - BDA_MOD_112QAM, - BDA_MOD_128QAM, - BDA_MOD_160QAM, - BDA_MOD_192QAM, - BDA_MOD_224QAM, - BDA_MOD_256QAM, - BDA_MOD_320QAM, - BDA_MOD_384QAM, - BDA_MOD_448QAM, - BDA_MOD_512QAM, - BDA_MOD_640QAM, - BDA_MOD_768QAM, - BDA_MOD_896QAM, - BDA_MOD_1024QAM, - BDA_MOD_QPSK, - BDA_MOD_BPSK, - BDA_MOD_OQPSK, - BDA_MOD_8VSB, - BDA_MOD_16VSB, - BDA_MOD_ANALOG_AMPLITUDE, - BDA_MOD_ANALOG_FREQUENCY, - BDA_MOD_MAX, +typedef V1_ENUM enum ModulationType { + BDA_MOD_NOT_SET = -1, + BDA_MOD_NOT_DEFINED = 0, + BDA_MOD_16QAM = 1, + BDA_MOD_32QAM, + BDA_MOD_64QAM, + BDA_MOD_80QAM, + BDA_MOD_96QAM, + BDA_MOD_112QAM, + BDA_MOD_128QAM, + BDA_MOD_160QAM, + BDA_MOD_192QAM, + BDA_MOD_224QAM, + BDA_MOD_256QAM, + BDA_MOD_320QAM, + BDA_MOD_384QAM, + BDA_MOD_448QAM, + BDA_MOD_512QAM, + BDA_MOD_640QAM, + BDA_MOD_768QAM, + BDA_MOD_896QAM, + BDA_MOD_1024QAM, + BDA_MOD_QPSK, + BDA_MOD_BPSK, + BDA_MOD_OQPSK, + BDA_MOD_8VSB, + BDA_MOD_16VSB, + BDA_MOD_ANALOG_AMPLITUDE, + BDA_MOD_ANALOG_FREQUENCY, + BDA_MOD_MAX, } ModulationType; - - -typedef V1_ENUM enum TransmissionMode -{ - BDA_XMIT_MODE_NOT_SET = -1, - BDA_XMIT_MODE_NOT_DEFINED = 0, - BDA_XMIT_MODE_2K = 1, - BDA_XMIT_MODE_8K, - BDA_XMIT_MODE_MAX, +typedef V1_ENUM enum TransmissionMode { + BDA_XMIT_MODE_NOT_SET = -1, + BDA_XMIT_MODE_NOT_DEFINED = 0, + BDA_XMIT_MODE_2K = 1, + BDA_XMIT_MODE_8K, + BDA_XMIT_MODE_MAX, } TransmissionMode; - -typedef V1_ENUM enum Polarisation -{ - BDA_POLARISATION_NOT_SET = -1, - BDA_POLARISATION_NOT_DEFINED = 0, - BDA_POLARISATION_LINEAR_H = 1, - BDA_POLARISATION_LINEAR_V, - BDA_POLARISATION_CIRCULAR_L, - BDA_POLARISATION_CIRCULAR_R, - BDA_POLARISATION_MAX, +typedef V1_ENUM enum Polarisation { + BDA_POLARISATION_NOT_SET = -1, + BDA_POLARISATION_NOT_DEFINED = 0, + BDA_POLARISATION_LINEAR_H = 1, + BDA_POLARISATION_LINEAR_V, + BDA_POLARISATION_CIRCULAR_L, + BDA_POLARISATION_CIRCULAR_R, + BDA_POLARISATION_MAX, } Polarisation; -typedef V1_ENUM enum GuardInterval -{ - BDA_GUARD_NOT_SET = -1, - BDA_GUARD_NOT_DEFINED = 0, - BDA_GUARD_1_32 = 1, - BDA_GUARD_1_16, - BDA_GUARD_1_8, - BDA_GUARD_1_4, - BDA_GUARD_MAX, +typedef V1_ENUM enum GuardInterval { + BDA_GUARD_NOT_SET = -1, + BDA_GUARD_NOT_DEFINED = 0, + BDA_GUARD_1_32 = 1, + BDA_GUARD_1_16, + BDA_GUARD_1_8, + BDA_GUARD_1_4, + BDA_GUARD_MAX, } GuardInterval; -typedef V1_ENUM enum HierarchyAlpha -{ - BDA_HALPHA_NOT_SET = -1, - BDA_HALPHA_NOT_DEFINED = 0, - BDA_HALPHA_1 = 1, - BDA_HALPHA_2, - BDA_HALPHA_4, - BDA_HALPHA_MAX, +typedef V1_ENUM enum HierarchyAlpha { + BDA_HALPHA_NOT_SET = -1, + BDA_HALPHA_NOT_DEFINED = 0, + BDA_HALPHA_1 = 1, + BDA_HALPHA_2, + BDA_HALPHA_4, + BDA_HALPHA_MAX, } HierarchyAlpha; - - -#endif - +#endif /* _BDATYPES_ */

14 years, 4 months

[akhaldi] 48329: [CMAKE] - We won't be using mkdir to create folders since cmake has a command for it. - Split nci generated files into separate targets, so that modules can depend on each one of them separately if needed. - Add win32ksys to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 28 12:58:37 2010 New Revision: 48329 URL: http://svn.reactos.org/svn/reactos?rev=48329&view=rev Log: [CMAKE] - We won't be using mkdir to create folders since cmake has a command for it. - Split nci generated files into separate targets, so that modules can depend on each one of them separately if needed. - Add win32ksys to build. Added: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/lib/CMakeLists.txt branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -83,19 +83,15 @@ # stupid nci tool can't create folders itself, se we're gonna create them for it set(nci_folders - dll\\ntdll\\def - lib\\ntdllsys\\ntdll - lib\\win32ksys - ntoskrnl\\include\\internal - ntoskrnl\\ex - subsystems\\win32\\win32k\\include + ${CMAKE_CURRENT_BINARY_DIR}/dll/ntdll/def + ${CMAKE_CURRENT_BINARY_DIR}/lib/ntdllsys/ntdll + ${CMAKE_CURRENT_BINARY_DIR}/lib/win32ksys + ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/include/internal + ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/ex + ${CMAKE_CURRENT_BINARY_DIR}/subsystems/win32/win32k/include ) -ADD_CUSTOM_COMMAND( - OUTPUT ${nci_folders} - COMMAND mkdir ${MKDIR_ARG} ${nci_folders} - WORKING_DIRECTORY ${REACTOS_BINARY_DIR} -) +file(MAKE_DIRECTORY ${nci_folders}) ADD_CUSTOM_COMMAND( OUTPUT ${nci_output} @@ -105,7 +101,8 @@ SET_SOURCE_FILES_PROPERTIES(${nci_output} PROPERTIES GENERATED TRUE) -ADD_CUSTOM_TARGET(nci_resources ALL DEPENDS ${nci_output}) +ADD_CUSTOM_TARGET(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) +ADD_CUSTOM_TARGET(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) endif() Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -21,6 +21,7 @@ add_subdirectory(sdk) add_subdirectory(smlib) add_subdirectory(tdilib) +add_subdirectory(win32ksys) else() Modified: branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ntdllsys/CMak… ============================================================================== --- branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -10,4 +10,4 @@ set_source_files_properties(${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S PROPERTIES GENERATED TRUE) add_library(ntdllsys ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) -add_dependencies(ntdllsys nci_resources) +add_dependencies(ntdllsys ntdllsys_S) Added: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/win32ksys/CMa… ============================================================================== --- branches/cmake-bringup/lib/win32ksys/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -1,0 +1,13 @@ + +get_directory_property(defines COMPILE_DEFINITIONS) + +foreach(arg ${defines}) + set(result_defs "${result_defs} -D${arg}") +endforeach(arg ${defines}) + +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>") + +set_source_files_properties(${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S PROPERTIES GENERATED TRUE) + +add_library(win32ksys ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) +add_dependencies(win32ksys win32k_S) Propchange: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -4,10 +4,8 @@ # Choose the right MinGW prefix if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) set(MINGW_PREFIX "") -set(MKDIR_ARG "") else() set(MINGW_PREFIX "mingw32-") -set(MKDIR_ARG "-p") endif() # the name of the target operating system

14 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
...
47
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 July 2010