Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 32965: - Fix paths to them for an installation cd.
by fireball＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: fireball Date: Mon Apr 14 15:50:09 2008 New Revision: 32965 URL: http://svn.reactos.org/svn/reactos?rev=32965&view=rev Log: - Fix paths to them for an installation cd. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 14 15:50:09 2008 @@ -487,7 +487,6 @@ modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional modules\vms\server\vmssrv.dll 1 optional modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional -modules\rosapps\avtest\avtest.sys 1 optional modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional @@ -512,9 +511,11 @@ modules\rosapps\dflat32\edit.exe 1 optional modules\rosapps\downloader\downloader.exe 1 optional modules\rosapps\downloader\downloader.xml 1 optional +modules\rosapps\drivers\avtest\avtest.sys 1 optional +modules\rosapps\drivers\ramdrv\ramdrv.sys 1 optional +modules\rosapps\drivers\green\green.sys 1 optional modules\rosapps\fontview\fontview.exe 1 optional modules\rosapps\gettype\gettype.exe 1 optional -modules\rosapps\green\green.sys 1 optional modules\rosapps\imagesoft\imagesoft.exe 1 optional modules\rosapps\lib\dflat32\dflat32.dll 1 optional modules\rosapps\mc\mc.exe 1 optional @@ -526,7 +527,6 @@ modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional modules\rosapps\packmgr\gui\packmgr.exe 1 optional modules\rosapps\packmgr\lib\package.dll 1 optional -modules\rosapps\ramdrv\ramdrv.sys 1 optional modules\rosapps\roshttpd\roshttpd.exe 1 optional modules\rosapps\screenshot\screenshot.exe 1 optional modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional

1 0

[fireball] 32964: - Gather drivers in a special "drivers" subdirectory. - Remove legacy _USE_W32API from those drivers.
by fireball＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: fireball Date: Mon Apr 14 15:49:45 2008 New Revision: 32964 URL: http://svn.reactos.org/svn/reactos?rev=32964&view=rev Log: - Gather drivers in a special "drivers" subdirectory. - Remove legacy _USE_W32API from those drivers. Added: trunk/rosapps/drivers/ trunk/rosapps/drivers/avtest/ - copied from r32880, trunk/rosapps/avtest/ trunk/rosapps/drivers/green/ - copied from r32880, trunk/rosapps/green/ trunk/rosapps/drivers/ramdrv/ - copied from r32880, trunk/rosapps/ramdrv/ Removed: trunk/rosapps/avtest/ trunk/rosapps/green/ trunk/rosapps/ramdrv/ Modified: trunk/rosapps/directory.rbuild trunk/rosapps/drivers/green/green.rbuild trunk/rosapps/drivers/ramdrv/ramdrv.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=32964… ============================================================================== --- trunk/rosapps/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/directory.rbuild [iso-8859-1] Mon Apr 14 15:49:45 2008 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="avtest"> - <xi:include href="avtest/avtest.rbuild" /> + <directory name="drivers"> + <xi:include href="drivers/directory.rbuild" /> </directory> <directory name="applications"> @@ -41,10 +41,6 @@ <xi:include href="gettype/gettype.rbuild" /> </directory> - <directory name="green"> - <xi:include href="green/green.rbuild" /> - </directory> - <directory name="imagesoft"> <xi:include href="imagesoft/imagesoft.rbuild" /> </directory> @@ -78,10 +74,6 @@ <xi:include href="packmgr/directory.rbuild" /> </directory> --> - - <directory name="ramdrv"> - <xi:include href="ramdrv/ramdrv.rbuild" /> - </directory> <directory name="roscalc"> <xi:include href="roscalc/roscalc.rbuild" /> Modified: trunk/rosapps/drivers/green/green.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/green.rbuild… ============================================================================== --- trunk/rosapps/drivers/green/green.rbuild [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/green.rbuild [iso-8859-1] Mon Apr 14 15:49:45 2008 @@ -1,6 +1,5 @@ <module name="green" type="kernelmodedriver" installbase="system32/drivers" installname="green.sys"> <bootstrap installbase="reactos" /> - <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>createclose.c</file> Modified: trunk/rosapps/drivers/ramdrv/ramdrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/ramdrv/ramdrv.rbui… ============================================================================== --- trunk/rosapps/drivers/ramdrv/ramdrv.rbuild [iso-8859-1] (original) +++ trunk/rosapps/drivers/ramdrv/ramdrv.rbuild [iso-8859-1] Mon Apr 14 15:49:45 2008 @@ -1,7 +1,6 @@ <module name="ramdrv" type="kernelmodedriver"> <include base="ramdrv">.</include> <include base="bzip2">.</include> - <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <library>bzip2</library>

1 0

[fireball] 32963: - Update readme.txt.
by fireball＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: fireball Date: Mon Apr 14 15:05:52 2008 New Revision: 32963 URL: http://svn.reactos.org/svn/reactos?rev=32963&view=rev Log: - Update readme.txt. Modified: trunk/rosapps/readme.txt Modified: trunk/rosapps/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/readme.txt?rev=32963&r1=32… ============================================================================== --- trunk/rosapps/readme.txt [iso-8859-1] (original) +++ trunk/rosapps/readme.txt [iso-8859-1] Mon Apr 14 15:05:52 2008 @@ -1,5 +1,3 @@ -$Id$ - ==================== ReactOS Applications ==================== @@ -7,19 +5,6 @@ This directory contains extra applicatons for ReactOS. Make sure you also have a copy of the rest of the ReactOS source before you attempt to build anything in this module. - -The following is a short decription of each. Check for a -readme.txt under each application for more details. - -CMDUTILS : External commands for CMD. -DEMOS : Demonstration applications -DEVUTILS : Extra developer tools. -DFLAT32 : Console text editor -GAMES : The start of the ReactOS games collection -MC : Midnight Commander -NET : Network tools (Ncftp, etc.) -NOTEVIL : ReactOS Coders Console Parade. -SYSUTILS : System Utilities. -TEMPLATES: Application Template (dialog, mdi, etc.) -Tests : Test applications (alphablend, mdi, moztest, wm_paint, etc.) -WELCOME : An alternative welcome dialog, the default one is part of the reactos dir. +It is to be placed under "modules" subdirectory of a trunk checkout. +No additional changes to build files are necessary, it'll be picked up +automatically.

1 0

[hpoussin] 32962: Also search in DirectX generated headers directory
by hpoussin＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: hpoussin Date: Mon Apr 14 14:36:42 2008 New Revision: 32962 URL: http://svn.reactos.org/svn/reactos?rev=32962&view=rev Log: Also search in DirectX generated headers directory Modified: trunk/reactos/ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Apr 14 14:36:42 2008 @@ -20,6 +20,7 @@ <include>include/psdk</include> <include root="intermediate">include/psdk</include> <include>include/dxsdk</include> + <include root="intermediate">include/dxsdk</include> <include>include/crt</include> <include>include/crt/mingw32</include> <include>include/ddk</include>

1 0

[greatlrd] 32961: add stub for dvdif.idl for now
by greatlrd＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: greatlrd Date: Mon Apr 14 13:45:26 2008 New Revision: 32961 URL: http://svn.reactos.org/svn/reactos?rev=32961&view=rev Log: add stub for dvdif.idl for now Added: trunk/reactos/include/dxsdk/dvdif.idl Added: trunk/reactos/include/dxsdk/dvdif.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dvdif.idl?re… ============================================================================== --- trunk/reactos/include/dxsdk/dvdif.idl (added) +++ trunk/reactos/include/dxsdk/dvdif.idl [iso-8859-1] Mon Apr 14 13:45:26 2008 @@ -1,0 +1,6 @@ +import "unknwn.idl"; +import "objidl.idl"; + +cpp_quote("#include <ddraw.h>") + +// fixme it is not completed

1 0

[greatlrd] 32960: do not mix in wine header here the guids, CLSID is wrong for dx stuff in wine.
by greatlrd＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: greatlrd Date: Mon Apr 14 11:21:11 2008 New Revision: 32960 URL: http://svn.reactos.org/svn/reactos?rev=32960&view=rev Log: do not mix in wine header here the guids, CLSID is wrong for dx stuff in wine. Removed: trunk/reactos/include/dxsdk/qedit.idl Modified: trunk/reactos/include/dxsdk/aviriff.h trunk/reactos/include/dxsdk/dxsdk.rbuild trunk/reactos/include/dxsdk/ksuuids.h trunk/reactos/include/dxsdk/uuids.h Modified: trunk/reactos/include/dxsdk/aviriff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/aviriff.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/aviriff.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/aviriff.h [iso-8859-1] Mon Apr 14 11:21:11 2008 @@ -141,9 +141,7 @@ } rcFrame; } AVISTREAMHEADER; -#if defined(_MSC_VER) #pragma warning(disable:4200) -#endif typedef struct _avioldindex { @@ -306,4 +304,4 @@ #include <poppack.h> -#endif +#endif Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] Mon Apr 14 11:21:11 2008 @@ -10,7 +10,6 @@ <file>mediaobj.idl</file> <file>medparam.idl</file> <file>mmstream.idl</file> - <file>qedit.idl</file> <file>regbag.idl</file> <file>tvratings.idl</file> <file>vidcap.idl</file> Modified: trunk/reactos/include/dxsdk/ksuuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ksuuids.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/ksuuids.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/ksuuids.h [iso-8859-1] Mon Apr 14 11:21:11 2008 @@ -1,50 +1,50 @@ #ifndef __KSUUIDS__ #define __KSUUIDS__ -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PROVIDER, 0xE06D8031, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_MPEG2Video, 0xE06D80e3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_DolbyAC3, 0xE06D80e4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(AM_KSPROPSETID_DVD_RateChange, 0x3577EB09, 0x9582, 0x477F, 0xB2, 0x9C, 0xB0, 0xC4, 0x52, 0xA4, 0xFF, 0x9A) -OUR_GUID_ENTRY(AM_KSPROPSETID_DvdKaraoke, 0xAE4720AE, 0xAA71, 0x42D8, 0xB8, 0x2A, 0xFF, 0xFD, 0xF5, 0x8B, 0x76, 0xFD) -OUR_GUID_ENTRY(AM_KSPROPSETID_FrameStep, 0xC830ACBD, 0xAB07, 0x492F, 0x88, 0x52, 0x45, 0xB6, 0x98, 0x7C, 0x29, 0x79) -OUR_GUID_ENTRY(AM_KSCATEGORY_CAPTURE, 0x65E8773DL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO, 0x6994AD05L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER, 0xa799a800L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO, 0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_DSI, 0xE06D8030, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DTS, 0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_SDDS, 0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x04F, 0xC3, 0x1D, 0x60) -OUR_GUID_ENTRY(MEDIATYPE_DVD_NAVIGATION, 0xE06D802E, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PCI, 0xE06D802F, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3, 0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(IID_IKsPin, 0xb61178D1L, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) -OUR_GUID_ENTRY(IID_IKsInterfaceHandler, 0xD3ABC7E0L, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(IID_IKsDataTypeHandler, 0x5FFBAA02L, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) -OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER, 0x65E8773EL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR, 0x1E84C900L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) -OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO, 0x6994AD04L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(FORMAT_MPEG2Audio, 0xE06D80e5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio, 0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(AM_KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00) -OUR_GUID_ENTRY(AM_KSPROPSETID_DvdSubPic, 0xAC390460, 0x43AF, 0x11D0, 0xbd, 0x6A, 0x00, 0x35, 0x05, 0xc1, 0x03, 0xA9) -OUR_GUID_ENTRY(AM_KSPROPSETID_CopyProt, 0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3) -OUR_GUID_ENTRY(AM_KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0 ) -OUR_GUID_ENTRY(IID_IKsPinFactory, 0xCD5EBE6BL, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A) -OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_MPEG2_VIDEO, 0xE06D80e3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_VIDEOINFO2, 0xF72A76A0L, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x0, 0x0, 0xC0, 0xCC, 0x16, 0xBA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE, 0xE06D802d, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(AM_INTERFACESETID_Standard, 0x1A8766A0L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) -OUR_GUID_ENTRY(IID_IKsControl, 0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR, 0xa799a801L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4) -OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO, 0xa799a802L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4) -OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC, 0x07dAD660L, 0x22F1, 0x11D1, 0xa9, 0xF4, 0x00, 0xc0, 0x4F, 0xBB, 0xDE, 0x8F) -OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER, 0x0A4252A0L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PROVIDER,0xE06D8031, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_MPEG2Video,0xE06D80e3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_DolbyAC3,0xE06D80e4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(AM_KSPROPSETID_DVD_RateChange,0x3577EB09, 0x9582, 0x477F, 0xB2, 0x9C, 0xB0, 0xC4, 0x52, 0xA4, 0xFF, 0x9A) +OUR_GUID_ENTRY(AM_KSPROPSETID_DvdKaraoke,0xAE4720AE, 0xAA71, 0x42D8, 0xB8, 0x2A, 0xFF, 0xFD, 0xF5, 0x8B, 0x76, 0xFD) +OUR_GUID_ENTRY(AM_KSPROPSETID_FrameStep,0xC830ACBD, 0xAB07, 0x492F, 0x88, 0x52, 0x45, 0xB6, 0x98, 0x7C, 0x29, 0x79) +OUR_GUID_ENTRY(AM_KSCATEGORY_CAPTURE,0x65E8773DL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO,0x6994AD05L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER,0xa799a800L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO,0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_DSI,0xE06D8030, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM,0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT,0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DTS,0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_SDDS,0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK,0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x04F, 0xC3, 0x1D, 0x60) +OUR_GUID_ENTRY(MEDIATYPE_DVD_NAVIGATION,0xE06D802E, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PCI,0xE06D802F, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO,0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3,0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(IID_IKsPin,0xb61178D1L, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) +OUR_GUID_ENTRY(IID_IKsInterfaceHandler,0xD3ABC7E0L, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(IID_IKsDataTypeHandler,0x5FFBAA02L, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) +OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER,0x65E8773EL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR,0x1E84C900L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) +OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO,0x6994AD04L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(FORMAT_MPEG2Audio,0xE06D80e5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio,0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(AM_KSPROPSETID_AC3,0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00) +OUR_GUID_ENTRY(AM_KSPROPSETID_DvdSubPic,0xAC390460, 0x43AF, 0x11D0, 0xbd, 0x6A, 0x00, 0x35, 0x05, 0xc1, 0x03, 0xA9) +OUR_GUID_ENTRY(AM_KSPROPSETID_CopyProt,0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3) +OUR_GUID_ENTRY(AM_KSPROPSETID_TSRateChange,0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0) +OUR_GUID_ENTRY(IID_IKsPinFactory, 0xCD5EBE6BL, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK,0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A) +OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES,0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO,0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_MPEG2_VIDEO,0xE06D80e3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_VIDEOINFO2,0xF72A76A0L, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x0, 0x0, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE,0xE06D802d, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(AM_INTERFACESETID_Standard, 0x1A8766A0L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) +OUR_GUID_ENTRY(IID_IKsControl,0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR,0xa799a801L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4) +OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO,0xa799a802L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4) +OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC,0x07dAD660L, 0x22F1, 0x11D1, 0xa9, 0xF4, 0x00, 0xc0, 0x4F, 0xBB, 0xDE, 0x8F) +OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER,0x0A4252A0L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) #endif Removed: trunk/reactos/include/dxsdk/qedit.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/qedit.idl?re… ============================================================================== --- trunk/reactos/include/dxsdk/qedit.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/qedit.idl (removed) @@ -1,168 +1,0 @@ -/* - * Copyright (C) 2008 Google (Lei Zhang) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "oaidl.idl"; -import "ocidl.idl"; -/* import "dxtrans.idl"; */ -import "amstream.idl"; -import "msxml.idl"; - -[ - object, - uuid(0579154A-2B53-4994-B0D0-E773148EFF85), - local, - pointer_default(unique) -] -interface ISampleGrabberCB : IUnknown -{ - HRESULT SampleCB( - double SampleTime, - IMediaSample * pSample - ); - HRESULT BufferCB( - double SampleTime, - BYTE * pBuffer, - long BufferLen - ); -} - -[ - object, - uuid(6B652FFF-11FE-4fce-92AD-0266B5D7C78F), - local, - pointer_default(unique) -] -interface ISampleGrabber: IUnknown -{ - HRESULT SetOneShot( - BOOL OneShot - ); - - HRESULT SetMediaType( - const AM_MEDIA_TYPE * pType - ); - - HRESULT GetConnectedMediaType( - AM_MEDIA_TYPE * pType - ); - - HRESULT SetBufferSamples( - BOOL BufferThem - ); - - HRESULT GetCurrentBuffer( - [in,out] long * pBufferSize, - [out] long * pBuffer - ); - - HRESULT GetCurrentSample( - [out] IMediaSample ** ppSample - ); - - HRESULT SetCallback( - ISampleGrabberCB * pCallback, - long WhichMethodToCallback - ); -}; - -[ - object, - uuid(65bd0710-24d2-4FF7-9324-ed2e5d3abafa), - pointer_default(unique) -] -interface IMediaDet : IUnknown -{ - HRESULT get_Filter( - [out] IUnknown* *pVal - ); - - HRESULT put_Filter( - IUnknown* newVal - ); - - HRESULT get_OutputStreams( - [out] long *pVal - ); - - HRESULT get_CurrentStream( - [out] long *pVal - ); - - HRESULT put_CurrentStream( - long newVal - ); - - HRESULT get_StreamType( - [out] GUID *pVal - ); - - HRESULT get_StreamTypeB( - [out] BSTR *pVal - ); - - HRESULT get_StreamLength( - [out] double *pVal - ); - - HRESULT get_Filename( - [out] BSTR *pVal - ); - - HRESULT put_Filename( - BSTR newVal - ); - - HRESULT GetBitmapBits( - double StreamTime, - long * pBufferSize, - char * pBuffer, - long Width, - long Height - ); - - HRESULT WriteBitmapBits( - double StreamTime, - long Width, - long Height, - BSTR Filename - ); - - HRESULT get_StreamMediaType( - [out] AM_MEDIA_TYPE * pVal - ); - - HRESULT GetSampleGrabber( - [out] ISampleGrabber ** ppVal - ); - - HRESULT get_FrameRate( - [out] double *pVal - ); - - HRESULT EnterBitmapGrabMode( - double SeekTime - ); -}; - -[ - uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), -] -coclass MediaDet -{ - [default] interface IMediaDet; -}; Modified: trunk/reactos/include/dxsdk/uuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/uuids.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/uuids.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/uuids.h [iso-8859-1] Mon Apr 14 11:21:11 2008 @@ -373,11 +373,8 @@ OUR_GUID_ENTRY(CLSID_TVEFilterCCProperties, 0x05500282, 0xFAA5, 0x4DF9, 0x82, 0x46, 0xBF, 0xC2, 0x3A, 0xC5, 0xCE, 0xA8) OUR_GUID_ENTRY(CLSID_TVEFilterStatsProperties, 0x05500283, 0xFAA5, 0x4DF9, 0x82, 0x46, 0xBF, 0xC2, 0x3A, 0xC5, 0xCE, 0xA8) OUR_GUID_ENTRY(CLSID_IVideoEncoderProxy, 0xB43c4eec, 0x8C32, 0x4791, 0x91, 0x02, 0x50, 0x8A, 0xda, 0x5E, 0xE8, 0xE7) -OUR_GUID_ENTRY(CLSID_ICodecAPIProxy, 0x7ff0997a, 0x1999, 0x4286, 0xA7, 0x3C, 0x62, 0x2B, 0x88, 0x14, 0xE7, 0xEB) -OUR_GUID_ENTRY(CLSID_IVideoEncoderCodecAPIProxy, 0xB05dabd9, 0x56e5, 0x4Fdc, 0xAF, 0xA4, 0x8A, 0x47, 0xE9, 0x1F, 0x1C, 0x9C) -OUR_GUID_ENTRY(CLSID_AVIDocWriter, 0xd3588ab1, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_NullRenderer, 0xc1f400a4, 0x3f08, 0x11d3, 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37) -OUR_GUID_ENTRY(CLSID_WAVEParser, 0xd51bd5a1, 0x7548, 0x11cf, 0xa5, 0x20, 0x00, 0x80, 0xc7, 0x7e, 0xf5, 0x8a) +OUR_GUID_ENTRY(CLSID_ICodecAPIProxy, 0x7ff0997a, 0x1999, 0x4286, 0xA7, 0x3C, 0x62, 0x2B, 0x88, 0x14, 0xE7, 0xEB ) +OUR_GUID_ENTRY(CLSID_IVideoEncoderCodecAPIProxy, 0xB05dabd9, 0x56e5, 0x4Fdc, 0xAF, 0xA4, 0x8A, 0x47, 0xE9, 0x1F, 0x1C, 0x9C ) #ifndef __ENCODER_API_GUIDS__ #define __ENCODER_API_GUIDS__

1 0

[dchapyshev] 32959: - Synchronised with wine head
by dchapyshev＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: dchapyshev Date: Mon Apr 14 09:20:49 2008 New Revision: 32959 URL: http://svn.reactos.org/svn/reactos?rev=32959&view=rev Log: - Synchronised with wine head Modified: trunk/reactos/dll/win32/user32/include/dde_private.h trunk/reactos/dll/win32/user32/misc/dde.c trunk/reactos/dll/win32/user32/misc/ddeclient.c Modified: trunk/reactos/dll/win32/user32/include/dde_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/d… ============================================================================== --- trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] Mon Apr 14 09:20:49 2008 @@ -164,6 +164,7 @@ DWORD monitorFlags; DWORD lastError; HWND hwndEvent; + DWORD wStatus; /* global instance status */ WDML_SERVER* servers; /* list of registered servers */ WDML_CONV* convs[2]; /* active conversations for this instance (client and server) */ WDML_LINK* links[2]; /* active links for this instance (client and server) */ @@ -198,6 +199,8 @@ extern WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); /* transaction handler on the server side */ extern WDML_QUEUE_STATE WDML_ServerHandle(WDML_CONV* pConv, WDML_XACT* pXAct); +/* transaction handler on the client side */ +HDDEDATA WDML_ClientHandle(WDML_CONV *pConv, WDML_XACT *pXAct, DWORD dwTimeout, LPDWORD pdwResult) DECLSPEC_HIDDEN; /* called both in DdeClientTransaction and server side. */ extern UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes, BOOL bUnicode, BOOL b16); @@ -222,7 +225,7 @@ extern BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz); extern BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz); extern ATOM WDML_MakeAtomFromHsz(HSZ hsz); -extern HSZ WDML_MakeHszFromAtom(WDML_INSTANCE* pInstance, ATOM atom); +extern HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom); /* client calls these */ extern WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, UINT wFmt, HSZ hszItem); extern void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct); Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] Mon Apr 14 09:20:49 2008 @@ -20,12 +20,15 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" #include <user32.h> - -#include <wine/debug.h> +#include "dde_private.h" +#include "wine/unicode.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ddeml); @@ -37,7 +40,9 @@ static LONG WDML_MaxInstanceID = 0; /* OK for present, have to worry about wrap-around later */ const WCHAR WDML_szEventClass[] = {'D','d','e','E','v','e','n','t','C','l','a','s','s',0}; -static CRITICAL_SECTION_DEBUG critsect_debug = +/* protection for instance list */ +CRITICAL_SECTION WDML_CritSect; +CRITICAL_SECTION_DEBUG critsect_debug = { 0, 0, &WDML_CritSect, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, @@ -111,13 +116,12 @@ case WM_DDE_ADVISE: case WM_DDE_DATA: case WM_DDE_POKE: - if (!lParam) return FALSE; - if (!(params = GlobalLock( (HGLOBAL)lParam ))) + if (!lParam || !(params = GlobalLock((HGLOBAL)lParam))) { - ERR("GlobalLock failed (%lx)\n", lParam); + if (uiLo) *uiLo = 0; + if (uiHi) *uiHi = 0; return FALSE; } - TRACE("unpacked: low %08lx, high %08lx\n", params[0], params[1]); if (uiLo) *uiLo = params[0]; if (uiHi) *uiHi = params[1]; GlobalUnlock( (HGLOBAL)lParam ); @@ -250,7 +254,7 @@ DWORD id = InterlockedIncrement(&WDML_MaxInstanceID); pInstance->instanceID = id; - TRACE("New instance id %ld allocated\n", id); + TRACE("New instance id %d allocated\n", id); } /****************************************************************** @@ -334,7 +338,7 @@ UINT ret; WNDCLASSEXW wndclass; - TRACE("(%p,%p,0x%lx,%ld)\n", + TRACE("(%p,%p,0x%x,%d)\n", pidInst, pfnCallback, afCmd, ulRes); if (ulRes) @@ -346,7 +350,7 @@ /* grab enough heap for one control struct - not really necessary for re-initialise * but allows us to use same validation routines */ - pInstance = (WDML_INSTANCE*)HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_INSTANCE)); + pInstance = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_INSTANCE)); if (pInstance == NULL) { /* catastrophe !! warn user & abort */ @@ -366,6 +370,7 @@ pInstance->win16 = b16; pInstance->nodeList = NULL; /* node will be added later */ pInstance->monitorFlags = afCmd & MF_MASK; + pInstance->wStatus = 0; pInstance->servers = NULL; pInstance->convs[0] = NULL; pInstance->convs[1] = NULL; @@ -388,7 +393,7 @@ if (*pidInst == 0) { /* Initialisation of new Instance Identifier */ - TRACE("new instance, callback %p flags %lX\n",pfnCallback,afCmd); + TRACE("new instance, callback %p flags %X\n",pfnCallback,afCmd); EnterCriticalSection(&WDML_CritSect); @@ -491,7 +496,7 @@ else { /* Reinitialisation situation --- FIX */ - TRACE("reinitialisation of (%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback, afCmd, ulRes); + TRACE("reinitialisation of (%p,%p,0x%x,%d): stub\n", pidInst, pfnCallback, afCmd, ulRes); EnterCriticalSection(&WDML_CritSect); @@ -518,7 +523,7 @@ { if ((reference_inst->CBFflags & CBF_FAIL_ALLSVRXACTIONS) != CBF_FAIL_ALLSVRXACTIONS) { - /* i.e. Was set to Client-only and through APPCMD_CLIENTONLY */ + /* i.e. Was set to Client-only and through APPCMD_CLIENTONLY */ if (!(afCmd & APPCMD_CLIENTONLY)) { @@ -616,16 +621,13 @@ WDML_CONV* pConv; WDML_CONV* pConvNext; - TRACE("(%ld)\n", idInst); - - EnterCriticalSection(&WDML_CritSect); + TRACE("(%d)\n", idInst); /* First check instance */ pInstance = WDML_GetInstance(idInst); if (pInstance == NULL) { - LeaveCriticalSection(&WDML_CritSect); /* * Needs something here to record NOT_INITIALIZED ready for DdeGetLastError */ @@ -668,10 +670,10 @@ for (inst = WDML_InstanceList; inst->next != pInstance; inst = inst->next); inst->next = pInstance->next; } - /* leave crit sect and release the heap entry + /* release the heap entry */ HeapFree(GetProcessHeap(), 0, pInstance); - LeaveCriticalSection(&WDML_CritSect); + return TRUE; } @@ -692,7 +694,9 @@ next = pInstance->next; if (pInstance->threadID == tid) { + LeaveCriticalSection(&WDML_CritSect); DdeUninitialize(pInstance->instanceID); + EnterCriticalSection(&WDML_CritSect); } } LeaveCriticalSection(&WDML_CritSect); @@ -711,10 +715,13 @@ if (pInstance == NULL) return NULL; + TRACE("invoking CB%d[%p] (%x %x %p %p %p %p %lx %lx)\n", pInstance->win16 ? 16 : 32, pInstance->callback, uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); - ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); + + ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); + TRACE("done => %p\n", ret); return ret; } @@ -729,6 +736,8 @@ WDML_INSTANCE* WDML_GetInstance(DWORD instId) { WDML_INSTANCE* pInstance; + + EnterCriticalSection(&WDML_CritSect); for (pInstance = WDML_InstanceList; pInstance != NULL; pInstance = pInstance->next) { @@ -739,11 +748,15 @@ FIXME("Tried to get instance from wrong thread\n"); continue; } - return pInstance; - } - } - TRACE("Instance entry missing\n"); - return NULL; + break; + } + } + + LeaveCriticalSection(&WDML_CritSect); + + if (!pInstance) + WARN("Instance entry missing for id %04x\n", instId); + return pInstance; } /****************************************************************** @@ -769,8 +782,6 @@ { DWORD error_code; WDML_INSTANCE* pInstance; - - EnterCriticalSection(&WDML_CritSect); /* First check instance */ @@ -785,7 +796,6 @@ pInstance->lastError = 0; } - LeaveCriticalSection(&WDML_CritSect); return error_code; } @@ -838,7 +848,7 @@ * Generally used while receiving a global atom and transforming it * into an HSZ */ -HSZ WDML_MakeHszFromAtom(WDML_INSTANCE* pInstance, ATOM atom) +HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom) { WCHAR nameBuffer[MAX_BUFFER_LEN]; @@ -937,7 +947,7 @@ HSZNode* pNew = NULL; /* Create a new node for this HSZ. */ - pNew = (HSZNode*)HeapAlloc(GetProcessHeap(), 0, sizeof(HSZNode)); + pNew = HeapAlloc(GetProcessHeap(), 0, sizeof(HSZNode)); if (pNew != NULL) { pNew->hsz = hsz; @@ -978,7 +988,7 @@ break; case CP_WINUNICODE: ret = GetAtomNameW(HSZ2ATOM(hsz), ptr, cchMax); - break; + break; default: ERR("Unknown code page %d\n", codepage); ret = 0; @@ -994,9 +1004,7 @@ DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); - - EnterCriticalSection(&WDML_CritSect); + TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); /* First check instance */ @@ -1006,9 +1014,8 @@ if (iCodePage == 0) iCodePage = CP_WINANSI; ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); } - LeaveCriticalSection(&WDML_CritSect); - - TRACE("returning %ld (%s)\n", ret, debugstr_a(psz)); + + TRACE("returning %d (%s)\n", ret, debugstr_a(psz)); return ret; } @@ -1021,9 +1028,7 @@ DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); - - EnterCriticalSection(&WDML_CritSect); + TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); /* First check instance */ @@ -1033,9 +1038,8 @@ if (iCodePage == 0) iCodePage = CP_WINUNICODE; ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); } - LeaveCriticalSection(&WDML_CritSect); - - TRACE("returning %ld (%s)\n", ret, debugstr_w(psz)); + + TRACE("returning %d (%s)\n", ret, debugstr_w(psz)); return ret; } @@ -1076,9 +1080,7 @@ HSZ hsz = 0; WDML_INSTANCE* pInstance; - TRACE("(%ld,%s,%d)\n", idInst, debugstr_a(psz), codepage); - - EnterCriticalSection(&WDML_CritSect); + TRACE("(%d,%s,%d)\n", idInst, debugstr_a(psz), codepage); pInstance = WDML_GetInstance(idInst); if (pInstance) @@ -1087,7 +1089,6 @@ hsz = WDML_CreateString(pInstance, psz, codepage); } - LeaveCriticalSection(&WDML_CritSect); return hsz; } @@ -1108,17 +1109,12 @@ WDML_INSTANCE* pInstance; HSZ hsz = 0; - TRACE("(%ld,%s,%d)\n", idInst, debugstr_w(psz), codepage); - - EnterCriticalSection(&WDML_CritSect); - pInstance = WDML_GetInstance(idInst); if (pInstance) { if (codepage == 0) codepage = CP_WINUNICODE; hsz = WDML_CreateString(pInstance, psz, codepage); } - LeaveCriticalSection(&WDML_CritSect); return hsz; } @@ -1134,9 +1130,7 @@ WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%ld,%p):\n", idInst, hsz); - - EnterCriticalSection(&WDML_CritSect); + TRACE("(%d,%p):\n", idInst, hsz); /* First check instance */ @@ -1144,8 +1138,6 @@ if (pInstance) ret = WDML_DecHSZ(pInstance, hsz); - LeaveCriticalSection(&WDML_CritSect); - return ret; } @@ -1161,9 +1153,7 @@ WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%ld,%p):\n", idInst, hsz); - - EnterCriticalSection(&WDML_CritSect); + TRACE("(%d,%p):\n", idInst, hsz); /* First check instance */ @@ -1171,7 +1161,6 @@ if (pInstance) ret = WDML_IncHSZ(pInstance, hsz); - LeaveCriticalSection(&WDML_CritSect); return ret; } @@ -1186,9 +1175,9 @@ * hsz2 [I] Handle to the second string * * RETURNS - * -1 The value of hsz1 is zero or less than hsz2 - * 0 The values of hsz 1 and 2 are the same or both zero. - * 1 The value of hsz2 is zero of less than hsz1 + * -1 The value of hsz1 is zero or less than hsz2 + * 0 The values of hsz 1 and 2 are the same or both zero. + * 1 The value of hsz2 is zero of less than hsz1 */ INT WINAPI DdeCmpStringHandles(HSZ hsz1, HSZ hsz2) { @@ -1267,7 +1256,7 @@ psz[1] = 0; } - TRACE("(%ld,%p,cb %ld, cbOff %ld,%p <%s>,fmt %04x,%x)\n", + TRACE("(%d,%p,cb %d, cbOff %d,%p <%s>,fmt %04x,%x)\n", idInst, pSrc, cb, cbOff, hszItem, debugstr_w(psz), wFmt, afCmd); if (afCmd != 0 && afCmd != HDATA_APPOWNED) @@ -1310,7 +1299,7 @@ DWORD old_sz, new_sz; LPBYTE pDst; - TRACE("(%p,%p,cb %ld, cbOff %ld)\n", hData, pSrc, cb, cbOff); + TRACE("(%p,%p,cb %d, cbOff %d)\n", hData, pSrc, cb, cbOff); pDst = DdeAccessData(hData, &old_sz); if (!pDst) return 0; @@ -1319,7 +1308,7 @@ if (new_sz > old_sz) { DdeUnaccessData(hData); - hData = GlobalReAlloc((HGLOBAL)hData, new_sz + sizeof(DDE_DATAHANDLE_HEAD), + hData = GlobalReAlloc(hData, new_sz + sizeof(DDE_DATAHANDLE_HEAD), GMEM_MOVEABLE | GMEM_DDESHARE); pDst = DdeAccessData(hData, &old_sz); } @@ -1349,7 +1338,7 @@ DWORD dwSize, dwRet; LPBYTE pByte; - TRACE("(%p,%p,%ld,%ld)\n", hData, pDst, cbMax, cbOff); + TRACE("(%p,%p,%d,%d)\n", hData, pDst, cbMax, cbOff); pByte = DdeAccessData(hData, &dwSize); @@ -1389,7 +1378,7 @@ */ LPBYTE WINAPI DdeAccessData(HDDEDATA hData, LPDWORD pcbDataSize) { - HGLOBAL hMem = (HGLOBAL)hData; + HGLOBAL hMem = hData; DDE_DATAHANDLE_HEAD* pDdh; TRACE("(%p,%p)\n", hData, pcbDataSize); @@ -1414,7 +1403,7 @@ */ BOOL WINAPI DdeUnaccessData(HDDEDATA hData) { - HGLOBAL hMem = (HGLOBAL)hData; + HGLOBAL hMem = hData; TRACE("(%p)\n", hData); @@ -1429,7 +1418,7 @@ BOOL WINAPI DdeFreeDataHandle(HDDEDATA hData) { TRACE("(%p)\n", hData); - return GlobalFree((HGLOBAL)hData) == 0; + return GlobalFree(hData) == 0; } /****************************************************************** @@ -1442,11 +1431,11 @@ DDE_DATAHANDLE_HEAD* pDdh; BOOL ret = FALSE; - pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock((HGLOBAL)hData); + pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock(hData); if (pDdh != NULL) { ret = pDdh->bAppOwned; - GlobalUnlock((HGLOBAL)hData); + GlobalUnlock(hData); } return ret; } @@ -1507,7 +1496,7 @@ } else { - ERR("Wrong count: %lu / %d\n", size, sizeof(BITMAP) + count); + ERR("Wrong count: %u / %d\n", size, count); } } else ERR("No bitmap header\n"); break; @@ -1605,7 +1594,7 @@ WCHAR buf1[256]; WCHAR buf2[256]; - pServer = (WDML_SERVER*)HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_SERVER)); + pServer = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_SERVER)); if (pServer == NULL) return NULL; pServer->hszService = hszService; @@ -1719,7 +1708,7 @@ { WDML_CONV* pConv; - /* no converstation yet, add it */ + /* no conversation yet, add it */ pConv = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_CONV)); if (!pConv) return NULL; @@ -1732,6 +1721,7 @@ pConv->transactions = NULL; pConv->hUser = 0; pConv->wStatus = (side == WDML_CLIENT_SIDE) ? ST_CLIENT : 0L; + pConv->wStatus |= pInstance->wStatus; /* check if both side of the conversation are of the same instance */ if (GetWindowThreadProcessId(hwndClient, NULL) == GetWindowThreadProcessId(hwndServer, NULL) && WDML_GetInstanceFromWnd(hwndClient) == WDML_GetInstanceFromWnd(hwndServer)) @@ -1742,6 +1732,8 @@ pConv->next = pInstance->convs[side]; pInstance->convs[side] = pConv; + + TRACE("pConv->wStatus %04x\n", pConv->wStatus); return pConv; } @@ -1834,7 +1826,8 @@ { if (wCmd == EC_DISABLE) { - FIXME("EC_DISABLE is not implemented\n"); + pConv->wStatus |= ST_BLOCKED; + TRACE("EC_DISABLE: conv %p status flags %04x\n", pConv, pConv->wStatus); return TRUE; } @@ -1847,18 +1840,28 @@ return FALSE; } + if (wCmd == EC_ENABLEALL) + { + pConv->wStatus &= ~ST_BLOCKED; + TRACE("EC_ENABLEALL: conv %p status flags %04x\n", pConv, pConv->wStatus); + } + while (pConv->transactions) { WDML_XACT *pXAct = pConv->transactions; - WDML_UnQueueTransaction(pConv, pXAct); if (pConv->wStatus & ST_CLIENT) { - /*WDML_ClientHandle(pConv, pXAct);*/ - FIXME("Client delayed transaction queue handling is not supported\n"); + /* transaction should be in the queue until handled */ + WDML_ClientHandle(pConv, pXAct, 0, NULL); + WDML_UnQueueTransaction(pConv, pXAct); } else + { + /* transaction should be removed from the queue before handling */ + WDML_UnQueueTransaction(pConv, pXAct); WDML_ServerHandle(pConv, pXAct); + } WDML_FreeTransaction(pConv->instance, pXAct, TRUE); @@ -1875,16 +1878,45 @@ BOOL ret = FALSE; WDML_CONV *pConv; - TRACE("(%ld, %p, %04x)\n", idInst, hConv, wCmd); - - EnterCriticalSection(&WDML_CritSect); - - pConv = WDML_GetConv(hConv, TRUE); - - if (pConv && pConv->instance->instanceID == idInst) - ret = WDML_EnableCallback(pConv, wCmd); - - LeaveCriticalSection(&WDML_CritSect); + TRACE("(%d, %p, %04x)\n", idInst, hConv, wCmd); + + if (hConv) + { + pConv = WDML_GetConv(hConv, TRUE); + + if (pConv && pConv->instance->instanceID == idInst) + ret = WDML_EnableCallback(pConv, wCmd); + } + else + { + WDML_INSTANCE *pInstance = WDML_GetInstance(idInst); + + if (!pInstance) + return FALSE; + + TRACE("adding flags %04x to instance %p\n", wCmd, pInstance); + pInstance->wStatus |= wCmd; + + if (wCmd == EC_DISABLE) + { + pInstance->wStatus |= ST_BLOCKED; + TRACE("EC_DISABLE: inst %p status flags %04x\n", pInstance, pInstance->wStatus); + } + else if (wCmd == EC_ENABLEALL) + { + pInstance->wStatus &= ~ST_BLOCKED; + TRACE("EC_ENABLEALL: inst %p status flags %04x\n", pInstance, pInstance->wStatus); + } + + ret = TRUE; + + for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv != NULL; pConv = pConv->next) + { + ret = WDML_EnableCallback(pConv, wCmd); + if (ret && wCmd == EC_QUERYWAITING) break; + } + } + return ret; } @@ -1900,16 +1932,19 @@ /* FIXME: should do better checking */ if (pConv == NULL || pConv->magic != WDML_CONV_MAGIC) return NULL; + if (!pConv->instance || pConv->instance->threadID != GetCurrentThreadId()) + { + WARN("wrong thread ID\n"); + pConv->instance->lastError = DMLERR_INVALIDPARAMETER; /* FIXME: check */ + return NULL; + } + if (checkConnected && !(pConv->wStatus & ST_CONNECTED)) { - FIXME("found conv but ain't connected\n"); + WARN("found conv but ain't connected\n"); + pConv->instance->lastError = DMLERR_NO_CONV_ESTABLISHED; return NULL; } - if (!pConv->instance || GetCurrentThreadId() != pConv->instance->threadID) - { - FIXME("wrong thread ID\n"); - return NULL; - } return pConv; } @@ -1930,7 +1965,7 @@ * */ BOOL WDML_PostAck(WDML_CONV* pConv, WDML_SIDE side, WORD appRetCode, - BOOL fBusy, BOOL fAck, UINT pmt, LPARAM lParam, UINT oldMsg) + BOOL fBusy, BOOL fAck, UINT_PTR pmt, LPARAM lParam, UINT oldMsg) { DDEACK ddeAck; HWND from, to; @@ -1958,6 +1993,7 @@ if (!PostMessageW(to, WM_DDE_ACK, (WPARAM)from, lParam)) { pConv->wStatus &= ~ST_CONNECTED; + pConv->instance->lastError = DMLERR_POSTMSG_FAILED; FreeDDElParam(WM_DDE_ACK, lParam); return FALSE; } @@ -1970,18 +2006,11 @@ BOOL WINAPI DdeSetUserHandle(HCONV hConv, DWORD id, DWORD hUser) { WDML_CONV* pConv; - BOOL ret = TRUE; - - TRACE("(%p,%lx,%lx)\n", hConv, id, hUser); - - EnterCriticalSection(&WDML_CritSect); pConv = WDML_GetConv(hConv, FALSE); if (pConv == NULL) - { - ret = FALSE; - goto theError; - } + return FALSE; + if (id == QID_SYNC) { pConv->hUser = hUser; @@ -1998,12 +2027,10 @@ else { pConv->instance->lastError = DMLERR_UNFOUND_QUEUE_ID; - ret = FALSE; - } - } - theError: - LeaveCriticalSection(&WDML_CritSect); - return ret; + return FALSE; + } + } + return TRUE; } /****************************************************************** @@ -2094,15 +2121,13 @@ CONVINFO ci; WDML_CONV* pConv; - TRACE("(%p,%lx,%p)\n", hConv, id, lpConvInfo); + TRACE("(%p,%x,%p)\n", hConv, id, lpConvInfo); if (!hConv) { FIXME("hConv is NULL\n"); return 0; } - - EnterCriticalSection(&WDML_CritSect); pConv = WDML_GetConv(hConv, FALSE); if (pConv != NULL) @@ -2120,7 +2145,7 @@ } ret = 0; } - LeaveCriticalSection(&WDML_CritSect); + if (ret != 0) memcpy(lpConvInfo, &ci, min((size_t)lpConvInfo->cb, sizeof(ci))); return ret; Modified: trunk/reactos/dll/win32/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddec… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/ddeclient.c [iso-8859-1] Mon Apr 14 09:20:49 2008 @@ -1091,6 +1091,37 @@ LeaveCriticalSection(&WDML_CritSect); return 0; +} + +/***************************************************************** + * WDML_ClientHandle + */ +HDDEDATA WDML_ClientHandle(WDML_CONV *pConv, WDML_XACT *pXAct, DWORD dwTimeout, LPDWORD pdwResult) +{ + HDDEDATA hDdeData; + + if (!PostMessageW(pConv->hwndServer, pXAct->ddeMsg, (WPARAM)pConv->hwndClient, pXAct->lParam)) + { + WARN("Failed posting message %x to %p (error=0x%x)\n", + pXAct->ddeMsg, pConv->hwndServer, GetLastError()); + pConv->wStatus &= ~ST_CONNECTED; + pConv->instance->lastError = DMLERR_POSTMSG_FAILED; + return 0; + } + pXAct->dwTimeout = dwTimeout; + /* FIXME: should set the app bits on *pdwResult */ + + if (dwTimeout == TIMEOUT_ASYNC) + { + if (pdwResult) + *pdwResult = MAKELONG(0, pXAct->xActID); + + hDdeData = (HDDEDATA)1; + } + else + hDdeData = WDML_SyncWaitTransactionReply((HCONV)pConv, dwTimeout, pXAct, pdwResult); + + return hDdeData; } /*****************************************************************

1 0

[dchapyshev] 32958: - Update more dll
by dchapyshev＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: dchapyshev Date: Mon Apr 14 09:06:36 2008 New Revision: 32958 URL: http://svn.reactos.org/svn/reactos?rev=32958&view=rev Log: - Update more dll Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Apr 14 09:06:36 2008 @@ -38,6 +38,7 @@ reactos/dll/win32/comcat # Autosync reactos/dll/win32/comctl32 # Autosync reactos/dll/win32/comdlg32 # Autosync +reactos/dll/win32/compstui # Autosync reactos/dll/win32/crypt32 # Out of sync reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync @@ -48,6 +49,7 @@ reactos/dll/win32/imm32 # Autosync reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. +reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/lz32 # Autosync reactos/dll/win32/mapi32 # Autosync reactos/dll/win32/mlang # Autosync @@ -60,6 +62,7 @@ reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/msxml3 # Synced to Wine-20071230 reactos/dll/win32/netapi32 # Autosync +reactos/dll/win32/ntdsapi # Autosync reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Autosync @@ -69,6 +72,7 @@ reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync reactos/dll/win32/powrprof # Autosync +reactos/dll/win32/printui # Autosync reactos/dll/win32/riched20 # Autosync reactos/dll/win32/riched32 # Autosync reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_55 @@ -142,7 +146,7 @@ reactos/dll/win32/user32/controls/scrollbar.c # Forked reactos/dll/win32/user32/controls/static.c # Synced at 20071024 - reactos/dll/win32/user32/misc/dde.c # Synced at 20060623 (dde_misc.c) + reactos/dll/win32/user32/misc/dde.c # Synced at 20080414 (dde_misc.c) reactos/dll/win32/user32/misc/ddeclient.c # Synced at 20060623 reactos/dll/win32/user32/misc/ddeserver.c # Synced at 20060623 reactos/dll/win32/user32/misc/exticon.c # Last sync date unknown

1 0

[hpoussin] 32957: mshtml has a DllMain() function
by hpoussin＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: hpoussin Date: Mon Apr 14 08:58:57 2008 New Revision: 32957 URL: http://svn.reactos.org/svn/reactos?rev=32957&view=rev Log: mshtml has a DllMain() function Modified: trunk/reactos/dll/win32/mshtml/mshtml.rbuild Modified: trunk/reactos/dll/win32/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.rb… ============================================================================== --- trunk/reactos/dll/win32/mshtml/mshtml.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/mshtml.rbuild [iso-8859-1] Mon Apr 14 08:58:57 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="mshtml" type="win32dll" baseaddress="${BASEADDRESS_MSHTML}" installbase="system32" installname="mshtml.dll" allowwarnings="true" entrypoint="0"> +<module name="mshtml" type="win32dll" baseaddress="${BASEADDRESS_MSHTML}" installbase="system32" installname="mshtml.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="mshtml.spec.def" /> <include base="mshtml">.</include>

1 0

[dchapyshev] 32956: - Add compstui, printui and ntdsapi to bootcd
by dchapyshev＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: dchapyshev Date: Mon Apr 14 08:12:11 2008 New Revision: 32956 URL: http://svn.reactos.org/svn/reactos?rev=32956&view=rev Log: - Add compstui, printui and ntdsapi to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 14 08:12:11 2008 @@ -180,6 +180,7 @@ dll\win32\comcat\comcat.dll 1 dll\win32\comctl32\comctl32.dll 1 dll\win32\comdlg32\comdlg32.dll 1 +dll\win32\compstui\compstui.dll 1 dll\win32\console\console.dll 1 dll\win32\crtdll\crtdll.dll 1 dll\win32\crypt32\crypt32.dll 1 @@ -224,6 +225,7 @@ dll\win32\netcfgx\netcfgx.dll 1 dll\win32\netid\netid.dll 1 dll\win32\newdev\newdev.dll 1 +dll\win32\ntdsapi\ntdsapi.dll 1 dll\win32\ntmarta\ntmarta.dll 1 dll\win32\objsel\objsel.dll 1 dll\win32\odbccp32\odbccp32.dll 1 @@ -234,6 +236,7 @@ dll\win32\olepro32\olepro32.dll 1 dll\win32\opengl32\opengl32.dll 1 dll\win32\powrprof\powrprof.dll 1 +dll\win32\printui\printui.dll 1 dll\win32\psapi\psapi.dll 1 dll\win32\rasapi32\rasapi32.dll 1 dll\win32\rasdlg\rasdlg.dll 1

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs