Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[tkreuzer] 46796: - include ntifs not ntddk in kddll.h - remove cxa_pure_virtual.c from mingw-lib - ewduce diff to trunk
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 20:43:27 2010 New Revision: 46796 URL: http://svn.reactos.org/svn/reactos?rev=46796&view=rev Log: - include ntifs not ntddk in kddll.h - remove cxa_pure_virtual.c from mingw-lib - ewduce diff to trunk Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h branches/ros-amd64-bringup/reactos/include/reactos/arc/arc.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h [iso-8859-1] Fri Apr 9 20:43:27 2010 @@ -9,7 +9,7 @@ #pragma once #define NOEXTAPI -#include <ntddk.h> +#include <ntifs.h> #define NDEBUG #include <halfuncs.h> #include <stdio.h> Modified: branches/ros-amd64-bringup/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/arc/arc.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/arc/arc.h [iso-8859-1] Fri Apr 9 20:43:27 2010 @@ -375,11 +375,6 @@ ULONG VirtualBias; } I386_LOADER_BLOCK, *PI386_LOADER_BLOCK; -typedef struct _AMD64_LOADER_BLOCK -{ - PVOID DbgPrint; -} AMD64_LOADER_BLOCK, *PAMD64_LOADER_BLOCK; - typedef struct _PPC_LOADER_BLOCK { PVOID BootInfo; @@ -482,7 +477,6 @@ union { I386_LOADER_BLOCK I386; - AMD64_LOADER_BLOCK Amd64; ALPHA_LOADER_BLOCK Alpha; IA64_LOADER_BLOCK IA64; PPC_LOADER_BLOCK PowerPC; Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c (removed) @@ -1,7 +1,0 @@ - -void _assert(int); - -void __cxa_pure_virtual() -{ - _assert(0); -} Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Fri Apr 9 20:43:27 2010 @@ -2,6 +2,7 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll"> + <library>oldnames</library> <define name="_CRTBLD" />  @@ -39,7 +40,6 @@ <file>xthdloc.c</file> <file>xtxtmode.c</file> <file>ofmt_stub.c</file> - <file>cxa_pure_virtual.c</file> </module> <module name="mingw_main" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Fri Apr 9 20:43:27 2010 @@ -87,7 +87,7 @@ typedef struct _PAGE_DIRECTORY_ARM { - union + union { HARDWARE_PDE_ARMV6 Pde[4096]; HARDWARE_LARGE_PTE_ARMV6 Pte[4096];

1 0

[tkreuzer] 46795: remove svn:mergeinfo from subfolders and files
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 20:39:05 2010 New Revision: 46795 URL: http://svn.reactos.org/svn/reactos?rev=46795&view=rev Log: remove svn:mergeinfo from subfolders and files Modified: branches/ros-amd64-bringup/reactos/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/downloader/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/fontview/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/magnify/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/winver/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/write/ (props changed) branches/ros-amd64-bringup/reactos/base/services/telnetd/ (props changed) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/classfactory.cpp (props changed) branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/ (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound_convert.c (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.c (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rbuild (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rc (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.spec (props changed) branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sb16_nt4.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sndblst.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/ (props changed) branches/ros-amd64-bringup/reactos/drivers/video/font/ftfd/ (props changed) branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h (props changed) branches/ros-amd64-bringup/reactos/include/ndk/amd64/ (props changed) branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c (props changed) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ (props changed) branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/ (props changed) branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-amd64-bringup/reactos/tools/ (props changed) branches/ros-amd64-bringup/reactos/tools/hpp/ (props changed) branches/ros-amd64-bringup/reactos/tools/rbuild_helper/ (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/ros-amd64-bringup/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 9 20:39:05 2010 @@ -1,3 +1,3 @@ /branches/header-work:45691-46463 /branches/ros-amd64-bringup:36852 -/trunk/reactos:39350-44067,44371-46584 +/trunk/reactos:39350-44067,44371-46584,46604 Propchange: branches/ros-amd64-bringup/reactos/base/applications/downloader/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/base/applications/downloader:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/base/applications/fontview/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/base/applications/fontview:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/base/applications/magnify/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/base/applications/magnify:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/base/applications/winver/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/base/applications/winver:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/base/applications/write/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/base/applications/write:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/base/services/telnetd/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/base/services/telnetd:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/boot/freeldr/freeldr/arch/amd64:40086-46584 Propchange: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/boot/freeldr/freeldr/include/arch/amd64:40086-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/classfactory.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,4 +1,0 @@ -/branches/header-work/dll/directx/bdaplgin/classfactory.cpp:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/classfactory.cpp:34741,34870,36969,40927,41070,41500,44339,44501,44503-44504,44506,44511-44512,44521,44523-44526,45124,45126-45127 -/branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/classfactory.cpp:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/bdaplgin/classfactory.cpp:46369-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,3 +1,0 @@ -/branches/header-work/dll/directx/d3d8/d3d8.spec:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505 -/trunk/reactos/dll/directx/d3d8/d3d8.spec:44770-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new:43757-44371,44770-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,4 +1,0 @@ -/branches/header-work/dll/directx/dsound_new/classfactory.c:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065 -/branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new/classfactory.c:44068-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,4 +1,0 @@ -/branches/header-work/dll/directx/dsound_new/dsound.spec:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065 -/trunk/reactos/dll/directx/dsound_new/dsound.spec:44068-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound_convert.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,4 +1,0 @@ -/branches/header-work/dll/directx/dsound_new/dsound_convert.c:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound_convert.c:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound_convert.c:34741,34870,36969,40927,41070,41500,44339,44501,44503-44504,44506,44511-44512,44521,44523-44526,45124,45126-45127 -/trunk/reactos/dll/directx/dsound_new/dsound_convert.c:46369-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,4 +1,0 @@ -/branches/header-work/dll/directx/dsound_new/regsvr.c:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound/regsvr.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36502-36503,36505,36898,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38355,39335,39639,40122-40123,40125,40155,40247,40324,40753,40927,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41070,41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857,43860,43905,43907,43969,44036-44037,44039-44040,44044-44045,44065 -/trunk/reactos/dll/directx/dsound_new/regsvr.c:44068-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/dll/keyboard/kbdlt1/kbdlt1.c:39351-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rbuild ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/dll/keyboard/kbdlt1/kbdlt1.rbuild:39351-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rc ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/dll/keyboard/kbdlt1/kbdlt1.rc:39351-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/dll/keyboard/kbdlt1/kbdlt1.spec:39351-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,3 +1,0 @@ -/branches/header-work/dll/shellext/devcpux/devcpux.spec:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264 -/trunk/reactos/dll/shellext/devcpux/devcpux.spec:44770-46584 Propchange: branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,3 +1,0 @@ -/branches/header-work/dll/shellext/slayer/slayer.spec:45691-46463 -/branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264 -/trunk/reactos/dll/shellext/slayer/slayer.spec:44770-46584 Propchange: branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sb16_nt4.old/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/drivers/multimedia/audio/sb16_nt4.old:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sndblst.old/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/drivers/multimedia/audio/sndblst.old:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/drivers/video/font/bmfd:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/drivers/video/font/ftfd/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/drivers/video/font/ftfd:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/include/crt/mingw32/intrin_x86.h:40086-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/header-work/include/ndk/amd64:45691-46463 -/trunk/reactos/include/ndk/amd64:46369-46584 Propchange: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,3 +1,0 @@ -/branches/header-work/include/ndk/amd64/asmmacro.S:45691-46463 -/branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992 -/trunk/reactos/include/ndk/amd64/asmmacro.S:44770-46584 Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/header-work/lib/sdk/crt/stdio/file.c:45691-46153 -/trunk/reactos/lib/sdk/crt/stdio/file.c:39350-44067,44371-46369,46467-46584 Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/header-work/lib/sdk/crt/time:45691-46463 -/trunk/reactos/lib/sdk/crt/time:43123-46584 Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/header-work/ntoskrnl/kdbg:45691-46463 -/trunk/reactos/ntoskrnl/kdbg:46369-46584 Propchange: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,3 +1,0 @@ -/branches/header-work/subsystems/win32/win32k/include/engobjects.h:45691-46463 -/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639 -/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:40091-46584 Propchange: branches/ros-amd64-bringup/reactos/tools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/tools:39350-44067,44371-45594,46369-46584 Propchange: branches/ros-amd64-bringup/reactos/tools/hpp/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/tools/hpp:40091-40500,40600-46584 Propchange: branches/ros-amd64-bringup/reactos/tools/rbuild_helper/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,1 +1,0 @@ -/trunk/reactos/tools/rbuild_helper:41027-41474,42237-46584 Propchange: branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,3 +1,0 @@ -/branches/header-work/tools/rsym/rsym.c:45691-46463 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992 -/trunk/reactos/tools/rsym/rsym.c:44770-46584 Propchange: branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,3 +1,0 @@ -/branches/header-work/tools/rsym/rsym.h:45691-46463 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992 -/trunk/reactos/tools/rsym/rsym.h:44770-46584 Propchange: branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,3 +1,0 @@ -/branches/header-work/tools/rsym/rsym.mak:45691-46463 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992 -/trunk/reactos/tools/rsym/rsym.mak:44770-46584 Propchange: branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,3 +1,0 @@ -/branches/header-work/tools/rsym/rsym_common.c:45691-46463 -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992 -/trunk/reactos/tools/rsym/rsym_common.c:44770-46584

1 0

[janderwald] 46794: [KS] - Return status success from unimplemented IKsClock_DispatchClose - Implement handling of KSPROPERTY_PIN_CONSTRAINEDDATARANGES property - Forward unhandled irps to lower device object - Fix asserts in KspHandleDataIntersection. The function is still a grotesk hack - Simply handling of property requests by merging filter properties into filter descriptor - Implement KsMethodHandler, KsMethodHandlerWithAllocator, KsFastMethodHandler - Fix a bug in KsPinGetFirstCloneStreamP
by janderwald＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: janderwald Date: Fri Apr 9 20:31:53 2010 New Revision: 46794 URL: http://svn.reactos.org/svn/reactos?rev=46794&view=rev Log: [KS] - Return status success from unimplemented IKsClock_DispatchClose - Implement handling of KSPROPERTY_PIN_CONSTRAINEDDATARANGES property - Forward unhandled irps to lower device object - Fix asserts in KspHandleDataIntersection. The function is still a grotesk hack - Simply handling of property requests by merging filter properties into filter descriptor - Implement KsMethodHandler, KsMethodHandlerWithAllocator, KsFastMethodHandler - Fix a bug in KsPinGetFirstCloneStreamPointer - Implement handling of KSPROPSETID_Topology (KspTopologyHandler) Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/methods.c trunk/reactos/drivers/ksfilter/ks/pin.c trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -2195,8 +2195,8 @@ return AutomationTableA->PropertySetsCount; /* sanity check */ - DPRINT("AutomationTableA EventItemSize %lu PropertySetsCount %lu\n", AutomationTableA->PropertyItemSize, AutomationTableA->PropertySetsCount); - DPRINT("AutomationTableB EventItemSize %lu PropertySetsCount %lu\n", AutomationTableB->PropertyItemSize, AutomationTableB->PropertySetsCount); + DPRINT("AutomationTableA PropertyItemSize %lu PropertySetsCount %lu\n", AutomationTableA->PropertyItemSize, AutomationTableA->PropertySetsCount); + DPRINT("AutomationTableB PropertyItemSize %lu PropertySetsCount %lu\n", AutomationTableB->PropertyItemSize, AutomationTableB->PropertySetsCount); ASSERT(AutomationTableA->PropertyItemSize == AutomationTableB->PropertyItemSize); /* now iterate all property sets and compare their guids */ Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -112,13 +112,11 @@ { UNIMPLEMENTED - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - - + return STATUS_SUCCESS; +} static KSDISPATCH_TABLE DispatchTable = { Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -287,11 +287,13 @@ PKSDATAFORMAT_WAVEFORMATEX WaveFormatIn; PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; NTSTATUS Status = STATUS_NOT_SUPPORTED; + ULONG Count; + const PKSDATARANGE* DataRanges; IoStack = IoGetCurrentIrpStackLocation(Irp); Buffer = Irp->UserBuffer; - DPRINT("KsPinPropertyHandler Irp %p Property %p Data %p DescriptorsCount %u Descriptor %p OutputLength %u Id %u\n", Irp, Property, Data, DescriptorsCount, Descriptor, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Property->Id); + //DPRINT("KsPinPropertyHandler Irp %p Property %p Data %p DescriptorsCount %u Descriptor %p OutputLength %u Id %u\n", Irp, Property, Data, DescriptorsCount, Descriptor, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Property->Id); switch(Property->Id) { @@ -322,6 +324,7 @@ break; case KSPROPERTY_PIN_DATARANGES: + case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) { @@ -330,9 +333,20 @@ break; } Size = sizeof(KSMULTIPLE_ITEM); - for (Index = 0; Index < Descriptor[Pin->PinId].DataRangesCount; Index++) - { - Size += Descriptor[Pin->PinId].DataRanges[Index]->FormatSize; + if (Property->Id == KSPROPERTY_PIN_DATARANGES || Descriptor[Pin->PinId].ConstrainedDataRangesCount == 0) + { + DataRanges = Descriptor[Pin->PinId].DataRanges; + Count = Descriptor[Pin->PinId].DataRangesCount; + } + else + { + DataRanges = Descriptor[Pin->PinId].ConstrainedDataRanges; + Count = Descriptor[Pin->PinId].ConstrainedDataRangesCount; + } + + for (Index = 0; Index < Count; Index++) + { + Size += ((DataRanges[Index]->FormatSize + 0x7) & ~0x7); } if (IoStack->Parameters.DeviceIoControl.OutputBufferLength == 0) @@ -354,16 +368,9 @@ break; } - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSMULTIPLE_ITEM)) - { - /* buffer too small */ - Status = STATUS_BUFFER_TOO_SMALL; - break; - } - /* store descriptor size */ Item->Size = Size; - Item->Count = Descriptor[Pin->PinId].DataRangesCount; + Item->Count = Count; if (IoStack->Parameters.DeviceIoControl.OutputBufferLength == sizeof(KSMULTIPLE_ITEM)) { @@ -374,10 +381,29 @@ /* now copy all dataranges */ Data = (PUCHAR)(Item +1); - for (Index = 0; Index < Descriptor[Pin->PinId].DataRangesCount; Index++) - { - RtlMoveMemory(Data, Descriptor[Pin->PinId].DataRanges[Index], Descriptor[Pin->PinId].DataRanges[Index]->FormatSize); - Data = ((PUCHAR)Data + Descriptor[Pin->PinId].DataRanges[Index]->FormatSize); + + /* alignment assert */ + ASSERT(((ULONG_PTR)Data & 0x7) == 0); + + for (Index = 0; Index < Count; Index++) + { + UNICODE_STRING GuidString; + /* convert the guid to string */ + RtlStringFromGUID(&DataRanges[Index]->MajorFormat, &GuidString); + DPRINT("Index %lu MajorFormat %S\n", Index, GuidString.Buffer); + RtlStringFromGUID(&DataRanges[Index]->SubFormat, &GuidString); + DPRINT("Index %lu SubFormat %S\n", Index, GuidString.Buffer); + RtlStringFromGUID(&DataRanges[Index]->Specifier, &GuidString); + DPRINT("Index %lu Specifier %S\n", Index, GuidString.Buffer); + RtlStringFromGUID(&DataRanges[Index]->Specifier, &GuidString); + DPRINT("Index %lu FormatSize %lu Flags %lu SampleSize %lu Reserved %lu KSDATAFORMAT %lu\n", Index, + DataRanges[Index]->FormatSize, DataRanges[Index]->Flags, DataRanges[Index]->SampleSize, DataRanges[Index]->Reserved, sizeof(KSDATAFORMAT)); + + RtlMoveMemory(Data, DataRanges[Index], DataRanges[Index]->FormatSize); + Data = ((PUCHAR)Data + DataRanges[Index]->FormatSize); + /* alignment assert */ + ASSERT(((ULONG_PTR)Data & 0x7) == 0); + Data = (PVOID)(((ULONG_PTR)Data + 0x7) & ~0x7); } Status = STATUS_SUCCESS; @@ -442,7 +468,9 @@ break; } + //DPRINT("Pin %lu Communication %lu\n", Pin->PinId, Descriptor[Pin->PinId].Communication); *((KSPIN_COMMUNICATION*)Buffer) = Descriptor[Pin->PinId].Communication; + Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; break; Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -567,8 +567,12 @@ } default: DPRINT1("unhandled function %u\n", IoStack->MinorFunction); + /* pass the irp down the driver stack */ + Status = KspForwardIrpSynchronous(DeviceObject, Irp); + + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; + return Status; } } Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -611,7 +611,7 @@ DataRange = (PKSDATARANGE)(MultipleItem + 1); /* FIXME make sure its 64 bit aligned */ - ASSERT(((ULONG_PTR)DataRange & 0x3F) == 0); + ASSERT(((ULONG_PTR)DataRange & 0x7) == 0); if (!This->Factory->FilterDescriptor || !This->PinDescriptorCount) { @@ -635,29 +635,63 @@ for(Index = 0; Index < MultipleItem->Count; Index++) { + UNICODE_STRING MajorFormat, SubFormat, Specifier; + /* convert the guid to string */ + RtlStringFromGUID(&DataRange->MajorFormat, &MajorFormat); + RtlStringFromGUID(&DataRange->SubFormat, &SubFormat); + RtlStringFromGUID(&DataRange->Specifier, &Specifier); + + DPRINT("Index %lu MajorFormat %S SubFormat %S Specifier %S FormatSize %lu SampleSize %lu Align %lu Flags %lx Reserved %lx DataLength %lu\n", Index, MajorFormat.Buffer, SubFormat.Buffer, Specifier.Buffer, + DataRange->FormatSize, DataRange->SampleSize, DataRange->Alignment, DataRange->Flags, DataRange->Reserved, DataLength); + + /* FIXME implement KsPinDataIntersectionEx */ /* Call miniport's properitary handler */ - Status = This->PinDescriptorsEx[Pin->PinId].IntersectHandler(NULL, /* context */ + Status = This->PinDescriptorsEx[Pin->PinId].IntersectHandler(&This->Filter, Irp, Pin, DataRange, - (PKSDATAFORMAT)This->PinDescriptorsEx[Pin->PinId].PinDescriptor.DataRanges, + This->PinDescriptorsEx[Pin->PinId].PinDescriptor.DataRanges[0], /* HACK */ DataLength, Data, &Length); - if (Status == STATUS_SUCCESS || Status == STATUS_BUFFER_OVERFLOW) - { + if (Status == STATUS_SUCCESS || Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + ASSERT(Length); IoStatus->Information = Length; + if (Status != STATUS_SUCCESS) + Status = STATUS_MORE_ENTRIES; break; } + DataRange = UlongToPtr(PtrToUlong(DataRange) + DataRange->FormatSize); /* FIXME make sure its 64 bit aligned */ - ASSERT(((ULONG_PTR)DataRange & 0x3F) == 0); + ASSERT(((ULONG_PTR)DataRange & 0x7) == 0); } IoStatus->Status = Status; return Status; } + +NTSTATUS +NTAPI +KspTopologyPropertyHandler( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + IKsFilterImpl * This; + + /* get filter implementation */ + This = (IKsFilterImpl*)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + /* sanity check */ + ASSERT(This); + + return KsTopologyPropertyHandler(Irp, Request, Data, &This->Topology); + +} + NTSTATUS NTAPI @@ -672,6 +706,9 @@ /* get filter implementation */ This = (IKsFilterImpl*)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + /* sanity check */ + ASSERT(This); /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -686,7 +723,7 @@ case KSPROPERTY_PIN_COMMUNICATION: case KSPROPERTY_PIN_CATEGORY: case KSPROPERTY_PIN_NAME: - case KSPROPERTY_PIN_PROPOSEDATAFORMAT: + case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: Status = KsPinPropertyHandler(Irp, Request, Data, This->PinDescriptorCount, This->PinDescriptors); break; case KSPROPERTY_PIN_GLOBALCINSTANCES: @@ -702,16 +739,11 @@ case KSPROPERTY_PIN_DATAINTERSECTION: Status = KspHandleDataIntersection(Irp, &Irp->IoStatus, Request, Data, IoStack->Parameters.DeviceIoControl.OutputBufferLength, This); break; - case KSPROPERTY_PIN_PHYSICALCONNECTION: - case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: - UNIMPLEMENTED - Status = STATUS_NOT_IMPLEMENTED; - break; default: UNIMPLEMENTED - Status = STATUS_UNSUCCESSFUL; - } - DPRINT("KspPinPropertyHandler Pins %lu Request->Id %lu Status %lx\n", This->PinDescriptorCount, Request->Id, Status); + Status = STATUS_NOT_FOUND; + } + //DPRINT("KspPinPropertyHandler Pins %lu Request->Id %lu Status %lx\n", This->PinDescriptorCount, Request->Id, Status); return Status; @@ -730,6 +762,7 @@ PKSFILTER FilterInstance; UNICODE_STRING GuidString; PKSPROPERTY Property; + ULONG SetCount = 0; /* obtain filter from object header */ Status = IKsFilter_GetFilterFromIrp(Irp, &Filter); @@ -742,47 +775,70 @@ /* current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - /* property was not handled */ + /* get property from input buffer */ Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + /* sanity check */ + ASSERT(IoStack->Parameters.DeviceIoControl.InputBufferLength >= sizeof(KSIDENTIFIER)); + + /* get filter instance */ + FilterInstance = Filter->lpVtbl->GetStruct(Filter); RtlStringFromGUID(&Property->Set, &GuidString); DPRINT("IKsFilter_DispatchDeviceIoControl property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); RtlFreeUnicodeString(&GuidString); - - if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) - { + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_METHOD) + { + const KSMETHOD_SET *MethodSet = NULL; + ULONG MethodItemSize = 0; + + /* check if the driver supports method sets */ + if (FilterInstance->Descriptor->AutomationTable && FilterInstance->Descriptor->AutomationTable->MethodSetsCount) + { + SetCount = FilterInstance->Descriptor->AutomationTable->MethodSetsCount; + MethodSet = FilterInstance->Descriptor->AutomationTable->MethodSets; + MethodItemSize = FilterInstance->Descriptor->AutomationTable->MethodItemSize; + } + + /* call method set handler */ + Status = KspMethodHandlerWithAllocator(Irp, SetCount, MethodSet, NULL, MethodItemSize); + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) + { + const KSPROPERTY_SET *PropertySet = NULL; + ULONG PropertyItemSize = 0; + + /* check if the driver supports method sets */ + if (FilterInstance->Descriptor->AutomationTable && FilterInstance->Descriptor->AutomationTable->PropertySetsCount) + { + SetCount = FilterInstance->Descriptor->AutomationTable->PropertySetsCount; + PropertySet = FilterInstance->Descriptor->AutomationTable->PropertySets; + PropertyItemSize = FilterInstance->Descriptor->AutomationTable->PropertyItemSize; + } + + /* needed for our property handlers */ + KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (KSPROPERTY_ITEM*)This; + + /* call property handler */ + Status = KspPropertyHandler(Irp, SetCount, PropertySet, NULL, PropertyItemSize); + } + else + { + /* sanity check */ + ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_ENABLE_EVENT || + IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_DISABLE_EVENT); + + Status = STATUS_NOT_FOUND; UNIMPLEMENTED; - - /* release filter interface */ - Filter->lpVtbl->Release(Filter); - - /* complete and forget irp */ - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; - } - - /* call property handler supported by ks */ - KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (KSPROPERTY_ITEM*)This; - Status = KspPropertyHandler(Irp, 2, FilterPropertySet, NULL, sizeof(KSPROPERTY_ITEM)); - - if (Status == STATUS_NOT_FOUND) - { - /* get filter instance */ - FilterInstance = Filter->lpVtbl->GetStruct(Filter); - - /* check if the driver supports property sets */ - if (FilterInstance->Descriptor->AutomationTable && FilterInstance->Descriptor->AutomationTable->PropertySetsCount) - { - /* call driver's filter property handler */ - Status = KspPropertyHandler(Irp, - FilterInstance->Descriptor->AutomationTable->PropertySetsCount, - FilterInstance->Descriptor->AutomationTable->PropertySets, - NULL, - FilterInstance->Descriptor->AutomationTable->PropertyItemSize); - } - } + } + + RtlStringFromGUID(&Property->Set, &GuidString); + DPRINT("IKsFilter_DispatchDeviceIoControl property Set |%S| Id %u Flags %x Status %lx ResultLength %lu\n", GuidString.Buffer, Property->Id, Property->Flags, Status, Irp->IoStatus.Information); + RtlFreeUnicodeString(&GuidString); + + /* release filter */ + Filter->lpVtbl->Release(Filter); if (Status != STATUS_PENDING) { @@ -953,6 +1009,7 @@ const KSFILTER_DESCRIPTOR* FilterDescriptor) { NTSTATUS Status; + KSAUTOMATION_TABLE AutomationTable; This->Filter.Descriptor = AllocateItem(NonPagedPool, sizeof(KSFILTER_DESCRIPTOR)); if (!This->Filter.Descriptor) @@ -968,6 +1025,17 @@ /* copy filter descriptor fields */ RtlMoveMemory((PVOID)This->Filter.Descriptor, FilterDescriptor, sizeof(KSFILTER_DESCRIPTOR)); + + /* zero automation table */ + RtlZeroMemory(&AutomationTable, sizeof(KSAUTOMATION_TABLE)); + + /* setup filter property sets */ + AutomationTable.PropertyItemSize = sizeof(KSPROPERTY_ITEM); + AutomationTable.PropertySetsCount = 2; + AutomationTable.PropertySets = FilterPropertySet; + + /* merge filter automation table */ + Status = KsMergeAutomationTables((PKSAUTOMATION_TABLE*)&This->Filter.Descriptor->AutomationTable, (PKSAUTOMATION_TABLE)FilterDescriptor->AutomationTable, &AutomationTable, This->Filter.Bag); return Status; } @@ -1303,7 +1371,6 @@ This->lpVtbl = &vt_IKsFilter; This->lpVtblKsControl = &vt_IKsControl; - This->Filter.Descriptor = Factory->FilterDescriptor; This->Factory = Factory; This->FilterFactory = iface; This->FileObject = IoStack->FileObject; Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -1720,9 +1720,11 @@ PLIST_ENTRY Entry; PCREATE_ITEM_ENTRY CreateItemEntry; +#ifndef MS_KSUSER /* remove '\' slash */ Buffer++; BufferSize -= sizeof(WCHAR); +#endif /* point to first entry */ Entry = ListHead->Flink; Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -156,3 +156,12 @@ IN PKSIDEVICE_HEADER DeviceHeader, IN BOOLEAN NewState); +NTSTATUS +NTAPI +KspMethodHandlerWithAllocator( + IN PIRP Irp, + IN ULONG MethodSetsCount, + IN const KSMETHOD_SET *MethodSet, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG MethodItemSize OPTIONAL); + Modified: trunk/reactos/drivers/ksfilter/ks/methods.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/method… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -8,8 +8,186 @@ #include "priv.h" +NTSTATUS +FindMethodHandler( + IN PIO_STATUS_BLOCK IoStatus, + IN const KSMETHOD_SET* MethodSet, + IN ULONG MethodSetCount, + IN PKSMETHOD Method, + IN ULONG InputBufferLength, + IN ULONG OutputBufferLength, + OUT PVOID OutputBuffer, + OUT PFNKSHANDLER *MethodHandler, + OUT PKSMETHOD_SET * Set) +{ + ULONG Index, ItemIndex; + + /* TODO */ + ASSERT((Method->Flags & KSMETHOD_TYPE_SETSUPPORT) == 0); + + for(Index = 0; Index < MethodSetCount; Index++) + { + ASSERT(MethodSet[Index].Set); + + if (IsEqualGUIDAligned(&Method->Set, MethodSet[Index].Set)) + { + for(ItemIndex = 0; ItemIndex < MethodSet[Index].MethodsCount; ItemIndex++) + { + if (MethodSet[Index].MethodItem[ItemIndex].MethodId == Method->Id) + { + if (MethodSet[Index].MethodItem[ItemIndex].MinMethod > InputBufferLength) + { + /* too small input buffer */ + IoStatus->Information = MethodSet[Index].MethodItem[ItemIndex].MinMethod; + return STATUS_INVALID_PARAMETER; + } + + if (MethodSet[Index].MethodItem[ItemIndex].MinData > OutputBufferLength) + { + /* too small output buffer */ + IoStatus->Information = MethodSet[Index].MethodItem[ItemIndex].MinData; + return STATUS_MORE_ENTRIES; + } + if (Method->Flags & KSMETHOD_TYPE_BASICSUPPORT) + { + PULONG Flags; + PKSPROPERTY_DESCRIPTION Description; + + if (sizeof(ULONG) > OutputBufferLength) + { + /* too small buffer */ + return STATUS_INVALID_PARAMETER; + } + + /* get output buffer */ + Flags = (PULONG)OutputBuffer; + + /* set flags flags */ + *Flags = MethodSet[Index].MethodItem[ItemIndex].Flags; + + IoStatus->Information = sizeof(ULONG); + + if (OutputBufferLength >= sizeof(KSPROPERTY_DESCRIPTION)) + { + /* get output buffer */ + Description = (PKSPROPERTY_DESCRIPTION)OutputBuffer; + + /* store result */ + Description->DescriptionSize = sizeof(KSPROPERTY_DESCRIPTION); + Description->PropTypeSet.Set = KSPROPTYPESETID_General; + Description->PropTypeSet.Id = 0; + Description->PropTypeSet.Flags = 0; + Description->MembersListCount = 0; + Description->Reserved = 0; + + IoStatus->Information = sizeof(KSPROPERTY_DESCRIPTION); + } + return STATUS_SUCCESS; + } + *MethodHandler = MethodSet[Index].MethodItem[ItemIndex].MethodHandler; + *Set = (PKSMETHOD_SET)&MethodSet[Index]; + return STATUS_SUCCESS; + } + } + } + } + return STATUS_NOT_FOUND; +} + +NTSTATUS +NTAPI +KspMethodHandlerWithAllocator( + IN PIRP Irp, + IN ULONG MethodSetsCount, + IN const KSMETHOD_SET *MethodSet, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG MethodItemSize OPTIONAL) +{ + PKSMETHOD Method; + PKSMETHOD_SET Set; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PFNKSHANDLER MethodHandler = NULL; + ULONG Index; + LPGUID Guid; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* check if inputbuffer at least holds KSMETHOD item */ + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSMETHOD)) + { + /* invalid parameter */ + Irp->IoStatus.Information = sizeof(KSPROPERTY); + return STATUS_INVALID_BUFFER_SIZE; + } + + /* FIXME probe the input / output buffer if from user mode */ + + /* get input property request */ + Method = (PKSMETHOD)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + +// DPRINT("KspMethodHandlerWithAllocator Irp %p PropertySetsCount %u PropertySet %p Allocator %p PropertyItemSize %u ExpectedPropertyItemSize %u\n", Irp, PropertySetsCount, PropertySet, Allocator, PropertyItemSize, sizeof(KSPROPERTY_ITEM)); + + /* sanity check */ + ASSERT(MethodItemSize == 0 || MethodItemSize == sizeof(KSMETHOD_ITEM)); + + /* find the method handler */ + Status = FindMethodHandler(&Irp->IoStatus, MethodSet, MethodSetsCount, Method, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Irp->UserBuffer, &MethodHandler, &Set); + + if (NT_SUCCESS(Status) && MethodHandler) + { + /* call method handler */ + KSMETHOD_SET_IRP_STORAGE(Irp) = Set; + Status = MethodHandler(Irp, Method, Irp->UserBuffer); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* output buffer is too small */ + if (Allocator) + { + /* allocate the requested amount */ + Status = Allocator(Irp, Irp->IoStatus.Information, FALSE); + + /* check if the block was allocated */ + if (!NT_SUCCESS(Status)) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* re-call method handler */ + Status = MethodHandler(Irp, Method, Irp->UserBuffer); + } + } + } + else if (IsEqualGUIDAligned(&Method->Set, &GUID_NULL) && Method->Id == 0 && Method->Flags == KSMETHOD_TYPE_SETSUPPORT) + { + // store output size + Irp->IoStatus.Information = sizeof(GUID) * MethodSetsCount; + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GUID) * MethodSetsCount) + { + // buffer too small + return STATUS_MORE_ENTRIES; + } + + // get output buffer + Guid = (LPGUID)Irp->UserBuffer; + + // copy property guids from property sets + for(Index = 0; Index < MethodSetsCount; Index++) + { + RtlMoveMemory(&Guid[Index], MethodSet[Index].Set, sizeof(GUID)); + } + return STATUS_SUCCESS; + } + + /* done */ + return Status; +} + /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -19,12 +197,11 @@ IN ULONG MethodSetsCount, IN PKSMETHOD_SET MethodSet) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + return KspMethodHandlerWithAllocator(Irp, MethodSetsCount, MethodSet, NULL, 0); } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -36,12 +213,39 @@ IN PFNKSALLOCATOR Allocator OPTIONAL, IN ULONG MethodItemSize OPTIONAL) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} + return KspMethodHandlerWithAllocator(Irp, MethodSetsCount, MethodSet, Allocator, MethodItemSize); +} + + +NTSTATUS +FindFastMethodHandler( + IN ULONG FastIoCount, + IN const KSFASTMETHOD_ITEM * FastIoTable, + IN PKSMETHOD MethodId, + OUT PFNKSFASTHANDLER * FastPropertyHandler) +{ + ULONG Index; + + /* iterate through all items */ + for(Index = 0; Index < FastIoCount; Index++) + { + if (MethodId->Id == FastIoTable[Index].MethodId) + { + if (FastIoTable[Index].MethodSupported) + { + *FastPropertyHandler = FastIoTable[Index].MethodHandler; + return STATUS_SUCCESS; + } + } + + } + /* no fast property handler found */ + return STATUS_NOT_FOUND; +} + /* - @unimplemented + @implemented */ KSDDKAPI BOOLEAN @@ -56,6 +260,68 @@ IN ULONG MethodSetsCount, IN const KSMETHOD_SET* MethodSet) { - UNIMPLEMENTED; + KSMETHOD MethodRequest; + KPROCESSOR_MODE Mode; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Index; + PFNKSFASTHANDLER FastMethodHandler; + + if (MethodLength < sizeof(KSPROPERTY)) + { + /* invalid request */ + return FALSE; + } + + /* get previous mode */ + Mode = ExGetPreviousMode(); + + if (Mode == KernelMode) + { + /* just copy it */ + RtlMoveMemory(&MethodRequest, Method, sizeof(KSMETHOD)); + } + else + { + /* need to probe the buffer */ + _SEH2_TRY + { + ProbeForRead(Method, sizeof(KSPROPERTY), sizeof(UCHAR)); + RtlMoveMemory(&MethodRequest, Method, sizeof(KSMETHOD)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + }_SEH2_END; + + if (!NT_SUCCESS(Status)) + return FALSE; + } + + /* are there any property sets provided */ + if (MethodSetsCount) + { + /* iterate through all property sets count */ + Index = 0; + do + { + /* does the property id match */ + if (IsEqualGUIDAligned(MethodSet[Index].Set, &MethodRequest.Set)) + { + /* try to find a fast property handler */ + Status = FindFastMethodHandler(MethodSet[Index].FastIoCount, MethodSet[Index].FastIoTable, &MethodRequest, &FastMethodHandler); + + if (NT_SUCCESS(Status)) + { + /* call fast property handler */ + ASSERT(MethodLength == sizeof(KSMETHOD)); /* FIXME check if property length is bigger -> copy params */ + ASSERT(Mode == KernelMode); /* FIXME need to probe usermode output buffer */ + return FastMethodHandler(FileObject, &MethodRequest, sizeof(KSMETHOD), Data, DataLength, IoStatus); + } + } + /* move to next item */ + Index++; + }while(Index < MethodSetsCount); + } return FALSE; } Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -21,6 +21,7 @@ ULONG Offset; ULONG Length; KSSTREAM_POINTER StreamPointer; + KSPIN_LOCK Lock; }KSISTREAM_POINTER, *PKSISTREAM_POINTER; typedef struct @@ -307,6 +308,7 @@ /* revert to old state */ This->Pin.ClientState = OldState; This->Pin.DeviceState = OldState; + DPRINT("IKsPin_PinStatePropertyHandler failed to set state %lx Result %lx\n", *NewState, Status); DbgBreakPoint(); } else @@ -429,6 +431,7 @@ _InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } +DPRINT("IKsPin_fnQueryInterface\n"); DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } @@ -674,6 +677,9 @@ IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(iface, IKsPinImpl, lpVtblReferenceClock); + + DPRINT1("IKsReferenceClock_fnGetTime\n"); + if (!This->ClockFileObject || !This->ClockTable.GetTime) { Result = 0; @@ -694,6 +700,9 @@ LONGLONG Result; IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(iface, IKsPinImpl, lpVtblReferenceClock); + + DPRINT1("IKsReferenceClock_fnGetPhysicalTime\n"); + if (!This->ClockFileObject || !This->ClockTable.GetPhysicalTime) { @@ -718,6 +727,8 @@ IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(iface, IKsPinImpl, lpVtblReferenceClock); + DPRINT1("IKsReferenceClock_fnGetCorrelatedTime\n"); + if (!This->ClockFileObject || !This->ClockTable.GetCorrelatedTime) { Result = 0; @@ -740,6 +751,8 @@ LONGLONG Result; IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(iface, IKsPinImpl, lpVtblReferenceClock); + + DPRINT1("IKsReferenceClock_fnGetCorrelatedPhysicalTime\n"); if (!This->ClockFileObject || !This->ClockTable.GetCorrelatedPhysicalTime) { @@ -1226,6 +1239,7 @@ } InterlockedDecrement(&This->IrpCount); + KsDecrementCountedWorker(This->PinWorker); /* get stream header */ if (StreamPointer->Irp->RequestorMode == UserMode) @@ -1374,9 +1388,11 @@ IN PKSSTREAM_POINTER StreamPointer, IN BOOLEAN Eject) { - UNIMPLEMENTED + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); + DPRINT("KsStreamPointerUnlock StreamPointer %pEject %lu\n", StreamPointer, Eject); - DbgBreakPoint(); + + Pointer->Irp = NULL; } /* @@ -1687,8 +1703,12 @@ IKsPinImpl * This; DPRINT("KsPinGetFirstCloneStreamPointer %p\n", Pin); -DbgBreakPoint(); + This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); + + if (!This->ClonedStreamPointer) + return NULL; + /* return first cloned stream pointer */ return &This->ClonedStreamPointer->StreamPointer; } @@ -1708,7 +1728,6 @@ DbgBreakPoint(); /* get stream pointer */ Pointer = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); - /* is there a another cloned stream pointer */ if (!Pointer->Next) Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Fri Apr 9 20:31:53 2010 @@ -270,13 +270,3 @@ return Status; } -NTSTATUS -NTAPI -KspTopologyPropertyHandler( - IN PIRP Irp, - IN PKSIDENTIFIER Request, - IN OUT PVOID Data) -{ - - return STATUS_NOT_IMPLEMENTED; -}

1 0

[akhaldi] 46793: - Fix WmiFireEvent Guid type. - Define WINSOCK_API_LINKAGE in ws2_32 - Remove winsock.h inclusion from ws2_32/misc/async.c
by akhaldi＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: akhaldi Date: Fri Apr 9 17:35:53 2010 New Revision: 46793 URL: http://svn.reactos.org/svn/reactos?rev=46793&view=rev Log: - Fix WmiFireEvent Guid type. - Define WINSOCK_API_LINKAGE in ws2_32 - Remove winsock.h inclusion from ws2_32/misc/async.c Modified: branches/header-work/dll/win32/ws2_32/misc/async.c branches/header-work/dll/win32/ws2_32/ws2_32.rbuild branches/header-work/drivers/wmi/wmilib.c Modified: branches/header-work/dll/win32/ws2_32/misc/async.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ws2_32/mi… ============================================================================== --- branches/header-work/dll/win32/ws2_32/misc/async.c [iso-8859-1] (original) +++ branches/header-work/dll/win32/ws2_32/misc/async.c [iso-8859-1] Fri Apr 9 17:35:53 2010 @@ -34,7 +34,6 @@ */ #include <windows.h> -#include <winsock.h> #define WS_FD_SETSIZE FD_SETSIZE #define HAVE_GETPROTOBYNAME Modified: branches/header-work/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ws2_32/ws… ============================================================================== --- branches/header-work/dll/win32/ws2_32/ws2_32.rbuild [iso-8859-1] (original) +++ branches/header-work/dll/win32/ws2_32/ws2_32.rbuild [iso-8859-1] Fri Apr 9 17:35:53 2010 @@ -3,6 +3,7 @@ <include base="ws2_32">include</include> <include base="ReactOS">include/reactos/wine</include> <define name="LE" /> + <define name="WINSOCK_API_LINKAGE">DECLSPEC_EXPORT</define> <library>wine</library> <library>ntdll</library> <library>user32</library> Modified: branches/header-work/drivers/wmi/wmilib.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wmi/wmilib.… ============================================================================== --- branches/header-work/drivers/wmi/wmilib.c [iso-8859-1] (original) +++ branches/header-work/drivers/wmi/wmilib.c [iso-8859-1] Fri Apr 9 17:35:53 2010 @@ -34,7 +34,7 @@ NTSTATUS NTAPI WmiFireEvent(IN PDEVICE_OBJECT DeviceObject, - IN LPGUID Guid, + IN LPCGUID Guid, IN ULONG InstanceIndex, IN ULONG EventDataSize, IN PVOID EventData)

1 0

[tkreuzer] 46792: merge 46604 from trunk
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 16:58:27 2010 New Revision: 46792 URL: http://svn.reactos.org/svn/reactos?rev=46792&view=rev Log: merge 46604 from trunk Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug.c branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug_ros.c Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] Fri Apr 9 16:58:27 2010 @@ -262,7 +262,7 @@ char *ret; int idx; - idx = InterlockedExchangeAdd( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); + idx = interlocked_xchg_add( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); if ((ret = realloc( list[idx], size ))) list[idx] = ret; return ret; } Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug_ros.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug_ros.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug_ros.c [iso-8859-1] Fri Apr 9 16:58:27 2010 @@ -5,6 +5,7 @@ #define free libwine_free #define realloc libwine_realloc #define _strdup libwine__strdup +#define interlocked_xchg_add InterlockedExchangeAdd #include "debug.c"

1 0

[tkreuzer] 46791: [RBUILD] pass --no-leading-underscore to dlltool on amd64 builds
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 16:40:47 2010 New Revision: 46791 URL: http://svn.reactos.org/svn/reactos?rev=46791&view=rev Log: [RBUILD] pass --no-leading-underscore to dlltool on amd64 builds Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Apr 9 16:40:47 2010 @@ -1568,9 +1568,18 @@ clean_files, backend->GetFullName ( *definitionFilename ).c_str () ); - fprintf ( fMakefile, - "\t${dlltool} --def %s --kill-at --output-lib $@\n", - backend->GetFullName ( *definitionFilename ).c_str () ); + if (Environment::GetArch() == "amd64") + { + fprintf ( fMakefile, + "\t${dlltool} --def %s --no-leading-underscore --output-lib $@\n", + backend->GetFullName ( *definitionFilename ).c_str () ); + } + else + { + fprintf ( fMakefile, + "\t${dlltool} --def %s --kill-at --output-lib $@\n", + backend->GetFullName ( *definitionFilename ).c_str () ); + } } else arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files );

1 0

[tkreuzer] 46790: [RPCRT4] Remove some definitions from unix_func.h, as we have them in our public headers now. This file is not wine synced.
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 15:06:30 2010 New Revision: 46790 URL: http://svn.reactos.org/svn/reactos?rev=46790&view=rev Log: [RPCRT4] Remove some definitions from unix_func.h, as we have them in our public headers now. This file is not wine synced. Modified: branches/header-work/dll/win32/rpcrt4/unix_func.h Modified: branches/header-work/dll/win32/rpcrt4/unix_func.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/rpcrt4/un… ============================================================================== --- branches/header-work/dll/win32/rpcrt4/unix_func.h [iso-8859-1] (original) +++ branches/header-work/dll/win32/rpcrt4/unix_func.h [iso-8859-1] Fri Apr 9 15:06:30 2010 @@ -1,18 +1,3 @@ - -#define POLLIN 001 -#define POLLPRI 002 -#define POLLOUT 004 -#define POLLNORM POLLIN -#define POLLERR 010 -#define POLLHUP 020 -#define POLLNVAL 040 - -struct pollfd -{ - int fd; /* file descriptor */ - short events; /* requested events */ - short revents; /* returned events */ -}; #define F_SETFL 4 /* set file->f_flags */ @@ -24,5 +9,4 @@ int poll(struct pollfd *fds, unsigned long nfds, int timo); int socketpair (int af, int type, int protocol, SOCKET socket[2]); -const char * inet_ntop (int af, const void *src, char *dst, size_t cnt); int fcntl(int fd, int cmd, long arg);

1 0

[tkreuzer] 46789: Don't define u_int64 in wine/dcetypes.idl
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 15:05:00 2010 New Revision: 46789 URL: http://svn.reactos.org/svn/reactos?rev=46789&view=rev Log: Don't define u_int64 in wine/dcetypes.idl Modified: branches/header-work/include/reactos/wine/dcetypes.idl Modified: branches/header-work/include/reactos/wine/dcetypes.idl URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/win… ============================================================================== --- branches/header-work/include/reactos/wine/dcetypes.idl [iso-8859-1] (original) +++ branches/header-work/include/reactos/wine/dcetypes.idl [iso-8859-1] Fri Apr 9 15:05:00 2010 @@ -28,7 +28,7 @@ typedef short signed16; typedef long signed32; typedef unsigned32 boolean32; -typedef unsigned hyper u_int64; +//typedef unsigned hyper u_int64; typedef unsigned long u_int32; typedef unsigned short u_int16; typedef unsigned small u_int8;

1 0

[tkreuzer] 46788: Add missing files
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 14:55:42 2010 New Revision: 46788 URL: http://svn.reactos.org/svn/reactos?rev=46788&view=rev Log: Add missing files Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ofmt_stub.c (with props) Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c [iso-8859-1] Fri Apr 9 14:55:42 2010 @@ -1,0 +1,7 @@ + +void _assert(int); + +void __cxa_pure_virtual() +{ + _assert(0); +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c [iso-8859-1] Fri Apr 9 14:55:42 2010 @@ -1,0 +1,394 @@ +#include <assert.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <getopt.h> +#include <stdarg.h> +#include <stdio.h> + +#define REPLACE_GETOPT + +#define _DIAGASSERT(x) do {} while (0) + +#ifdef REPLACE_GETOPT +#ifdef __weak_alias +__weak_alias(getopt,_getopt) +#endif +int opterr = 1; +int optind = 1; +int optopt = '?'; +int optreset; +char *optarg; +#endif + +#ifdef __weak_alias +__weak_alias(getopt_long,_getopt_long) +#endif + +#ifndef __CYGWIN__ +#define __progname __argv[0] +#else +extern char __declspec(dllimport) *__progname; +#endif + +#define IGNORE_FIRST (*options == '-' || *options == '+') +#define PRINT_ERROR ((opterr) && ((*options != ':') || (IGNORE_FIRST && options[1] != ':'))) + +#ifndef IS_POSIXLY_CORRECT +#define IS_POSIXLY_CORRECT (getenv("POSIXLY_CORRECT") != NULL) +#endif + +#define PERMUTE (!IS_POSIXLY_CORRECT && !IGNORE_FIRST) + +#define IN_ORDER (!IS_POSIXLY_CORRECT && *options == '-') + +#define BADCH (int)'?' +#define BADARG ((IGNORE_FIRST && options[1] == ':') || (*options == ':') ? (int)':' : (int)'?') +#define INORDER (int)1 + +static char EMSG[1]; + +static int getopt_internal (int,char * const *,const char *); +static int gcd (int,int); +static void permute_args (int,int,int,char * const *); + +static char *place = EMSG; + +static int nonopt_start = -1; +static int nonopt_end = -1; + +static const char recargchar[] = "option requires an argument -- %c"; +static const char recargstring[] = "option requires an argument -- %s"; +static const char ambig[] = "ambiguous option -- %.*s"; +static const char noarg[] = "option doesn't take an argument -- %.*s"; +static const char illoptchar[] = "unknown option -- %c"; +static const char illoptstring[] = "unknown option -- %s"; + +static void +_vwarnx(const char *fmt,va_list ap) +{ + (void)fprintf(stderr,"%s: ",__progname); + if (fmt != NULL) + (void)vfprintf(stderr,fmt,ap); + (void)fprintf(stderr,"\n"); +} + +static void +warnx(const char *fmt,...) +{ + va_list ap; + va_start(ap,fmt); + _vwarnx(fmt,ap); + va_end(ap); +} + +static int +gcd(a,b) + int a; + int b; +{ + int c; + + c = a % b; + while (c != 0) { + a = b; + b = c; + c = a % b; + } + + return b; +} + +static void +permute_args(panonopt_start,panonopt_end,opt_end,nargv) + int panonopt_start; + int panonopt_end; + int opt_end; + char * const *nargv; +{ + int cstart,cyclelen,i,j,ncycle,nnonopts,nopts,pos; + char *swap; + + _DIAGASSERT(nargv != NULL); + + nnonopts = panonopt_end - panonopt_start; + nopts = opt_end - panonopt_end; + ncycle = gcd(nnonopts,nopts); + cyclelen = (opt_end - panonopt_start) / ncycle; + + for (i = 0; i < ncycle; i++) { + cstart = panonopt_end+i; + pos = cstart; + for (j = 0; j < cyclelen; j++) { + if (pos >= panonopt_end) + pos -= nnonopts; + else + pos += nopts; + swap = nargv[pos]; + + ((char **) nargv)[pos] = nargv[cstart]; + + ((char **)nargv)[cstart] = swap; + } + } +} + +static int +getopt_internal(nargc,nargv,options) + int nargc; + char * const *nargv; + const char *options; +{ + char *oli; + int optchar; + + _DIAGASSERT(nargv != NULL); + _DIAGASSERT(options != NULL); + + optarg = NULL; + + if (optind == 0) + optind = 1; + + if (optreset) + nonopt_start = nonopt_end = -1; +start: + if (optreset || !*place) { + optreset = 0; + if (optind >= nargc) { + place = EMSG; + if (nonopt_end != -1) { + + permute_args(nonopt_start,nonopt_end,optind,nargv); + optind -= nonopt_end - nonopt_start; + } + else if (nonopt_start != -1) { + + optind = nonopt_start; + } + nonopt_start = nonopt_end = -1; + return -1; + } + if ((*(place = nargv[optind]) != '-') + || (place[1] == '\0')) { + place = EMSG; + if (IN_ORDER) { + + optarg = nargv[optind++]; + return INORDER; + } + if (!PERMUTE) { + + return -1; + } + + if (nonopt_start == -1) + nonopt_start = optind; + else if (nonopt_end != -1) { + permute_args(nonopt_start,nonopt_end,optind,nargv); + nonopt_start = optind - + (nonopt_end - nonopt_start); + nonopt_end = -1; + } + optind++; + + goto start; + } + if (nonopt_start != -1 && nonopt_end == -1) + nonopt_end = optind; + if (place[1] && *++place == '-') { + place++; + return -2; + } + } + if ((optchar = (int)*place++) == (int)':' || + (oli = strchr(options + (IGNORE_FIRST ? 1 : 0),optchar)) == NULL) { + + if (!*place) + ++optind; + if (PRINT_ERROR) + warnx(illoptchar,optchar); + optopt = optchar; + return BADCH; + } + if (optchar == 'W' && oli[1] == ';') { + + if (*place) + return -2; + + if (++optind >= nargc) { + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar,optchar); + optopt = optchar; + return BADARG; + } else + place = nargv[optind]; + + return -2; + } + if (*++oli != ':') { + if (!*place) + ++optind; + } else { + optarg = NULL; + if (*place) + optarg = place; + + else if (oli[1] != ':') { + if (++optind >= nargc) { + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar,optchar); + optopt = optchar; + return BADARG; + } else + optarg = nargv[optind]; + } + place = EMSG; + ++optind; + } + + return optchar; +} + +#ifdef REPLACE_GETOPT + +int +getopt(nargc,nargv,options) + int nargc; + char * const *nargv; + const char *options; +{ + int retval; + + _DIAGASSERT(nargv != NULL); + _DIAGASSERT(options != NULL); + + if ((retval = getopt_internal(nargc,nargv,options)) == -2) { + ++optind; + + if (nonopt_end != -1) { + permute_args(nonopt_start,nonopt_end,optind,nargv); + optind -= nonopt_end - nonopt_start; + } + nonopt_start = nonopt_end = -1; + retval = -1; + } + return retval; +} +#endif + +int +getopt_long(nargc,nargv,options,long_options,idx) + int nargc; + char * const *nargv; + const char *options; + const struct option *long_options; + int *idx; +{ + int retval; + + _DIAGASSERT(nargv != NULL); + _DIAGASSERT(options != NULL); + _DIAGASSERT(long_options != NULL); + + if ((retval = getopt_internal(nargc,nargv,options)) == -2) { + char *current_argv,*has_equal; + size_t current_argv_len; + int i,match; + + current_argv = place; + match = -1; + + optind++; + place = EMSG; + + if (*current_argv == '\0') { + + if (nonopt_end != -1) { + permute_args(nonopt_start,nonopt_end,optind,nargv); + optind -= nonopt_end - nonopt_start; + } + nonopt_start = nonopt_end = -1; + return -1; + } + if ((has_equal = strchr(current_argv,'=')) != NULL) { + + current_argv_len = has_equal - current_argv; + has_equal++; + } else + current_argv_len = strlen(current_argv); + + for (i = 0; long_options[i].name; i++) { + + if (strncmp(current_argv,long_options[i].name,current_argv_len)) + continue; + + if (strlen(long_options[i].name) == + (unsigned)current_argv_len) { + + match = i; + break; + } + if (match == -1) + match = i; + else { + + if (PRINT_ERROR) + warnx(ambig,(int)current_argv_len,current_argv); + optopt = 0; + return BADCH; + } + } + if (match != -1) { + if (long_options[match].has_arg == no_argument + && has_equal) { + if (PRINT_ERROR) + warnx(noarg,(int)current_argv_len,current_argv); + + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + return BADARG; + } + if (long_options[match].has_arg == required_argument || + long_options[match].has_arg == optional_argument) { + if (has_equal) + optarg = has_equal; + else if (long_options[match].has_arg == + required_argument) { + + optarg = nargv[optind++]; + } + } + if ((long_options[match].has_arg == required_argument) + && (optarg == NULL)) { + + if (PRINT_ERROR) + warnx(recargstring,current_argv); + + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + --optind; + return BADARG; + } + } else { + if (PRINT_ERROR) + warnx(illoptstring,current_argv); + optopt = 0; + return BADCH; + } + if (long_options[match].flag) { + *long_options[match].flag = long_options[match].val; + retval = 0; + } else + retval = long_options[match].val; + if (idx) + *idx = match; + } + return retval; +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Fri Apr 9 14:55:42 2010 @@ -22,9 +22,9 @@ <file>crt_handler.c</file> <file>dllentry.c</file> <file>gccmain.c</file> + <file>getopt.c</file> <file>gs_support.c</file> <file>merr.c</file> -  <file>mingw_helpers.c</file> <file>natstart.c</file> <file>pesect.c</file> @@ -38,6 +38,8 @@ <file>xncommod.c</file> <file>xthdloc.c</file> <file>xtxtmode.c</file> + <file>ofmt_stub.c</file> + <file>cxa_pure_virtual.c</file> </module> <module name="mingw_main" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ofmt_stub.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ofmt_stub.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ofmt_stub.c [iso-8859-1] Fri Apr 9 14:55:42 2010 @@ -1,0 +1,6 @@ + +int _get_output_format(void) +{ + return 0; +} + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ofmt_stub.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 46787: Link C++ modules against libsupc++.a, too as in newer gcc versions libstdc++ doesn't duplicate these definitions anymore.
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 14:49:28 2010 New Revision: 46787 URL: http://svn.reactos.org/svn/reactos?rev=46787&view=rev Log: Link C++ modules against libsupc++.a, too as in newer gcc versions libstdc++ doesn't duplicate these definitions anymore. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Fri Apr 9 14:49:28 2010 @@ -483,7 +483,7 @@ // We use our proprietary "ofmt_stub.a" to implement a stub for "_get_output_format" required by "libmingwex.a". // This archive just contains the compiled "ofmt_stub.s" supplied with the MinGW Runtime sources. - fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" " ); + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libsupc++.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" " ); /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64")

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2010