Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 40165: SVN maintenance: Set svn:eol-style to "native" for PHP, JS, SQL and TXT files

by cfinck＠svn.reactos.org

16 years, 4 months

[cfinck] 40164: Sync all non-RosCMS stuff to r40163

by cfinck＠svn.reactos.org

16 years, 4 months

[cfinck] 40163: This shouldn't have been committed in r38000...

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Mar 21 16:24:32 2009 New Revision: 40163 URL: http://svn.reactos.org/svn/reactos?rev=40163&view=rev Log: This shouldn't have been committed in r38000... Modified: trunk/web/reactos.org/htdocs/wiki/includes/Sanitizer.php Modified: trunk/web/reactos.org/htdocs/wiki/includes/Sanitizer.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/includ… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/includes/Sanitizer.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/wiki/includes/Sanitizer.php [iso-8859-1] Sat Mar 21 16:24:32 2009 @@ -1,4 +1,4 @@ -<?php +ï»¿<?php /** * XHTML sanitizer for MediaWiki * @@ -726,7 +726,6 @@ * @return HTML-encoded text fragment */ static function encodeAttribute( $text ) { - if( is_object( $text ) ) debug_print_backtrace(); $encValue = htmlspecialchars( $text, ENT_QUOTES ); // Whitespace is normalized during attribute decoding,

16 years, 4 months

[cfinck] 40162: Fix file encoding (= remove UTF-8 BOM)

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Mar 21 16:06:57 2009 New Revision: 40162 URL: http://svn.reactos.org/svn/reactos?rev=40162&view=rev Log: Fix file encoding (= remove UTF-8 BOM) Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] Sat Mar 21 16:06:57 2009 @@ -1,4 +1,4 @@ -ï»¿<?php +<?php /* PROJECT: People Map of the ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation

16 years, 4 months

[cgutman] 40161: - Uncomment the NdisUnmapFile call in NdisCloseFile - Found by Dmitry Chapyshev

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Mar 21 16:01:12 2009 New Revision: 40161 URL: http://svn.reactos.org/svn/reactos?rev=40161&view=rev Log: - Uncomment the NdisUnmapFile call in NdisCloseFile - Found by Dmitry Chapyshev Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Sat Mar 21 16:01:12 2009 @@ -121,6 +121,19 @@ */ VOID EXPORT +NdisUnmapFile( + IN NDIS_HANDLE FileHandle) +{ + PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; + + HandleObject->Mapped = FALSE; +} + +/* + * @implemented + */ +VOID +EXPORT NdisCloseFile( IN NDIS_HANDLE FileHandle) { @@ -134,10 +147,8 @@ ASSERT ( FileHandleObject->FileHandle ); - /* if ( FileHandleObject->Mapped ) NdisUnmapFile ( FileHandle ); - */ ZwClose ( FileHandleObject->FileHandle ); @@ -258,20 +269,6 @@ */ VOID EXPORT -NdisUnmapFile( - IN NDIS_HANDLE FileHandle) -{ - PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; - - HandleObject->Mapped = FALSE; -} - - -/* - * @implemented - */ -VOID -EXPORT NdisGetCurrentProcessorCounts( OUT PULONG pIdleCount, OUT PULONG pKernelAndUser,

16 years, 4 months

[dchapyshev] 40160: - Fix typo

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Mar 21 15:50:33 2009 New Revision: 40160 URL: http://svn.reactos.org/svn/reactos?rev=40160&view=rev Log: - Fix typo Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] Sat Mar 21 15:50:33 2009 @@ -4,7 +4,7 @@ LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> - TRANSLATOR: Dnitry Chapyshev + TRANSLATOR: Dmitry Chapyshev charset=utf-8 without BOM */

16 years, 4 months

[dchapyshev] 40158: - Add Russian translation for peoplemap

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Mar 21 15:32:17 2009 New Revision: 40158 URL: http://svn.reactos.org/svn/reactos?rev=40158&view=rev Log: - Add Russian translation for peoplemap Added: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php (with props) Modified: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php Added: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php [iso-8859-1] Sat Mar 21 15:32:17 2009 @@ -1,0 +1,51 @@ +ï»¿<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Translation + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> + TRANSLATOR: Dnitry Chapyshev + + charset=utf-8 without BOM +*/ + + $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">ÐÐ»Ð°Ð²Ð½Ð°Ñ</a> > ÐÐ°ÑÑÐ° Ð»ÑÐ´ÐµÐ¹ ReactOS'; + $peoplemap_langres["title"] = "ÐÐ°ÑÑÐ° Ð»ÑÐ´ÐµÐ¹ ReactOS"; + $peoplemap_langres["intro"] = "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÐºÐ°ÑÑÐ° Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¾Ð² Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ ReactOS."; + + $peoplemap_langres["filter"] = "Ð¤Ð¸Ð»ÑÑÑ Ð¿Ð¾ Ð³ÑÑÐ¿Ð¿Ðµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"; + $peoplemap_langres["filter_intro"] = "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÑÐ»Ð°Ð¶Ð¾Ðº Ð½Ð°Ð¿ÑÐ¾ÑÐ¸Ð² Ð³ÑÑÐ¿Ð¿Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, ÑÑÐ¾Ð±Ñ Ð¿Ð¾ÐºÐ°Ð·Ð°ÑÑ Ð¸Ð»Ð¸ ÑÐºÑÑÑÑ Ð¸Ñ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ñ ÐºÐ°ÑÑÑ."; + + $peoplemap_langres["add"] = "ÐÐ¾Ð¸ÑÐº Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ ÐµÐ³Ð¾ Ð½Ð° ÐºÐ°ÑÑÑ"; + $peoplemap_langres["add_username"] = "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"; + $peoplemap_langres["add_fullname"] = "ÐÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ"; + + $peoplemap_langres["mylocation"] = "ÐÐ¾Ðµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ°ÑÑÐµ"; + $peoplemap_langres["mylocation_login"] = "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð¾Ð²Ð°Ð½Ñ, ÑÑÐ¾Ð±Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð²Ð°ÑÐµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ."; + $peoplemap_langres["mylocation_login_page"] = "ÐÐ²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ"; + $peoplemap_langres["mylocation_intro"] = "ÐÐ´ÐµÑÑ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð²Ð°ÑÐµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ°ÑÑÐµ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ´ÐµÐ»Ð°ÑÑ ÑÑÐ¾ Ð¾Ð´Ð½Ð¸Ð¼ Ð¸Ð· ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ ÑÐ¿Ð¾ÑÐ¾Ð±Ð¾Ð²:"; + $peoplemap_langres["mylocation_marker_intro"] = "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÐµ Ð¼Ð°ÑÐºÐµÑ Ð² Ð²Ð°ÑÐµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ°ÑÑÐµ."; + $peoplemap_langres["mylocation_marker_button"] = "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ"; + $peoplemap_langres["mylocation_marker_save_intro"] = "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Ð´Ð»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ<br>Ð²Ð°ÑÐµÐ³Ð¾ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ."; + $peoplemap_langres["mylocation_marker_save_button"] = "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¼Ð¾Ðµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"; + $peoplemap_langres["mylocation_marker_cancel"] = "ÐÑÐ¼ÐµÐ½Ð°"; + $peoplemap_langres["mylocation_coordinates_intro"] = "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÐºÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ ÑÐ°Ð¼Ð¾ÑÑÐ¾ÑÑÐµÐ»ÑÐ½Ð¾:"; + $peoplemap_langres["mylocation_coordinates_button"] = "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ"; + $peoplemap_langres["mylocation_coordinates_invalid"] = "ÐÑÐ¾ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐµ ÐºÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ!"; + $peoplemap_langres["mylocation_delete_intro"] = "ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð´Ð°Ð½Ð½ÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÐ²Ð¾Ðµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ñ ÐºÐ°ÑÑÑ."; + $peoplemap_langres["mylocation_delete_button"] = "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¼Ð¾Ðµ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"; + + $peoplemap_langres["latitude"] = "Ð¨Ð¸ÑÐ¾ÑÐ°"; + $peoplemap_langres["longitude"] = "ÐÐ¾Ð»Ð³Ð¾ÑÐ°"; + $peoplemap_langres["removefrommap"] = "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ ÐºÐ°ÑÑÑ"; + $peoplemap_langres["minquerylength"] = "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð²Ð²ÐµÐ´Ð¸ÑÐµ Ð¿ÐµÑÐ²ÑÐµ 3 ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°."; + $peoplemap_langres["nousers"] = "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð½Ð° ÐºÐ°ÑÑÐµ!"; + $peoplemap_langres["activatejs"] = "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð²ÐºÐ»ÑÑÐ¸ÑÑ JavaScript, ÑÑÐ¾Ð±Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ Ð»ÑÐ´ÐµÐ¹!"; + $peoplemap_langres["unsupportedbrowser"] = "ÐÐ°ÑÑÐ° Ð»ÑÐ´ÐµÐ¹ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð²Ð°ÑÐ¸Ð¼ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð¼."; + + $peoplemap_langres["count1"] = "ÐÐ¾ÐºÐ°Ð·Ð°Ð½Ð¾ <strong>"; + $peoplemap_langres["count2"] = " Ð¸Ð· "; + $peoplemap_langres["count3"] = "</strong> Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ñ Ð´Ð°Ð½Ð½ÑÐ¼Ð¸ Ð½Ð° ÐºÐ°ÑÑÐµ ("; + $peoplemap_langres["count4"] = " - Ð²ÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹)"; + $peoplemap_langres["icons"] = "ÐÐºÐ¾Ð½ÐºÐ°"; +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/lang/ru.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php [iso-8859-1] Sat Mar 21 15:32:17 2009 @@ -13,5 +13,6 @@ "de" => "Deutsch (German)", "es" => "EspaÃ±ol (Spanish)", "pl" => "Polski (Polish)", + "ru" => "Ð ÑÑÑÐºÐ¸Ð¹ (Russian)", ); ?>

16 years, 4 months

[cfinck] 40157: Enable the Crash Recovery feature when doing the RegTest. Now the new sysreg2 just needs to be set up on the Buildslave and we might finally be able to remove all those "Skip Test xyz, because ROS sucks" hacks.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Mar 21 15:21:12 2009 New Revision: 40157 URL: http://svn.reactos.org/svn/reactos?rev=40157&view=rev Log: Enable the Crash Recovery feature when doing the RegTest. Now the new sysreg2 just needs to be set up on the Buildslave and we might finally be able to remove all those "Skip Test xyz, because ROS sucks" hacks. Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Sat Mar 21 15:21:12 2009 @@ -51,4 +51,4 @@ ; after 3rd boot ; [GuiRunOnce] -%SystemRoot%\system32\rosautotest.exe /s +%SystemRoot%\system32\rosautotest.exe /r /s

16 years, 4 months

[fireball] 40156: - Allocate and initialize setup loader block. - Add setup loader block pointer conversion to WinLdrInitializePhase1 (if it exists). - Temporary: provide empty boot options string.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Mar 21 14:11:44 2009 New Revision: 40156 URL: http://svn.reactos.org/svn/reactos?rev=40156&view=rev Log: - Allocate and initialize setup loader block. - Add setup loader block pointer conversion to WinLdrInitializePhase1 (if it exists). - Temporary: provide empty boot options string. Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Sat Mar 21 14:11:44 2009 @@ -21,6 +21,8 @@ #include <freeldr.h> #include <ndk/ldrtypes.h> +#include <arc/setupblk.h> + #include <debug.h> // TODO: Move to .h @@ -155,6 +157,7 @@ CHAR SystemPath[512], SearchPath[512]; CHAR FileName[512]; CHAR BootPath[512]; + CHAR LoadOptions[512]; LPCSTR BootOptions; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; @@ -163,6 +166,7 @@ HINF InfHandle; INFCONTEXT InfContext; PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; + PSETUP_LOADER_BLOCK SetupBlock; KERNEL_ENTRY_POINT KiSystemStartup; PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL; // Mm-related things @@ -249,6 +253,14 @@ /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); + /* Allocate and initialize setup loader block */ + SetupBlock = MmHeapAlloc(sizeof(SETUP_LOADER_BLOCK)); + RtlZeroMemory(SetupBlock, sizeof(SETUP_LOADER_BLOCK)); + LoaderBlock->SetupLdrBlock = SetupBlock; + + /* Set textmode setup flag */ + SetupBlock->Flags = SETUPLDR_TEXT_MODE; + /* Detect hardware */ UseRealHeap = TRUE; LoaderBlock->ConfigurationRoot = MachHwDetect(); @@ -300,7 +312,8 @@ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, (PCHAR)BootOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); + LoadOptions[0] = 0; + WinLdrInitializePhase1(LoaderBlock, LoadOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; @@ -325,6 +338,11 @@ //WinLdrpDumpBootDriver(LoaderBlockVA); //WinLdrpDumpArcDisks(LoaderBlockVA); + /*asm(".intel_syntax noprefix\n"); + asm("test1:\n"); + asm("jmp test1\n"); + asm(".att_syntax\n");*/ + /* Pass control */ (*KiSystemStartup)(LoaderBlockVA); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat Mar 21 14:11:44 2009 @@ -201,7 +201,11 @@ Extension->DrvDBImage = PaToVa(WinLdrLoadModule(MiscFiles, &Extension->DrvDBSize, LoaderRegistryData)); + /* Convert extension and setup block pointers */ LoaderBlock->Extension = PaToVa(Extension); + + if (LoaderBlock->SetupLdrBlock) + LoaderBlock->SetupLdrBlock = PaToVa(LoaderBlock->SetupLdrBlock); } // Last step before going virtual

16 years, 4 months

[sserapion] 40155: Remove wine/msacm.h it just duplicated the one with have in psdk/ but with extra incorrect definitions. Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask

by sserapion＠svn.reactos.org

Author: sserapion Date: Sat Mar 21 14:07:04 2009 New Revision: 40155 URL: http://svn.reactos.org/svn/reactos?rev=40155&view=rev Log: Remove wine/msacm.h it just duplicated the one with have in psdk/ but with extra incorrect definitions. Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask Removed: branches/ros-amd64-bringup/reactos/include/reactos/wine/msacm.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h branches/ros-amd64-bringup/reactos/include/psdk/msacm.h branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h branches/ros-amd64-bringup/reactos/include/reactos/wine/msacmdrv.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h [iso-8859-1] Sat Mar 21 14:07:04 2009 @@ -381,8 +381,8 @@ #define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes)) typedef struct { - DWORD dwCallback; - DWORD dwInstance; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; HMIDIOUT hMidi; DWORD dwFlags; } PORTALLOC, *LPPORTALLOC; @@ -393,7 +393,7 @@ DWORD_PTR dwCallback; DWORD_PTR dwInstance; UINT uMappedDeviceID; - DWORD dnDevNode; + DWORD_PTR dnDevNode; } WAVEOPENDESC, *LPWAVEOPENDESC; typedef struct { @@ -403,9 +403,9 @@ typedef struct { HMIDI hMidi; - DWORD dwCallback; - DWORD dwInstance; - DWORD dnDevNode; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; + DWORD_PTR dnDevNode; DWORD cIds; MIDIOPENSTRMID rgIds; } MIDIOPENDESC, *LPMIDIOPENDESC; @@ -413,9 +413,9 @@ typedef struct tMIXEROPENDESC { HMIXEROBJ hmx; - LPVOID pReserved0; - DWORD dwCallback; - DWORD dwInstance; + LPVOID pReserved0; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; } MIXEROPENDESC, *LPMIXEROPENDESC; typedef struct { @@ -433,7 +433,7 @@ } MCI_OPEN_DRIVER_PARMSW, *LPMCI_OPEN_DRIVER_PARMSW; DWORD WINAPI mciGetDriverData(UINT uDeviceID); -BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD dwData); +BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD_PTR dwData); UINT WINAPI mciDriverYield(UINT uDeviceID); BOOL WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID, UINT uStatus); @@ -449,8 +449,8 @@ #define DCB_TYPEMASK 0x0007 #define DCB_NOSWITCH 0x0008 /* don't switch stacks for callback */ -BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, - UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2); +BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, UINT uFlags, HDRVR hDev, + UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); typedef void (*LPTASKCALLBACK)(DWORD dwInst); @@ -458,9 +458,9 @@ #define TASKERR_OUTOFMEMORY 2 MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD); void WINAPI mmTaskBlock(HANDLE); -BOOL WINAPI mmTaskSignal(HANDLE); +BOOL WINAPI mmTaskSignal(DWORD); void WINAPI mmTaskYield(void); -HANDLE WINAPI mmGetCurrentTask(void); +DWORD WINAPI mmGetCurrentTask(void); #define WAVE_DIRECTSOUND 0x0080 Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] Sat Mar 21 14:07:04 2009 @@ -1452,7 +1452,7 @@ HPSTR pchEndWrite; LONG lBufOffset; LONG lDiskOffset; - DWORD adwInfo[4]; + DWORD adwInfo[3]; DWORD dwReserved1; DWORD dwReserved2; HMMIO hmmio; @@ -1644,9 +1644,9 @@ WORD wReserved5; } MCI_WAVE_SET_PARMS,*PMCI_WAVE_SET_PARMS,*LPMCI_WAVE_SET_PARMS; -LRESULT WINAPI CloseDriver(HDRVR,LONG,LONG); -HDRVR WINAPI OpenDriver(LPCWSTR,LPCWSTR,LONG); -LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LONG,LONG); +LRESULT WINAPI CloseDriver(HDRVR,LPARAM,LPARAM); +HDRVR WINAPI OpenDriver(LPCWSTR,LPCWSTR,LPARAM); +LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LPARAM,LPARAM); HMODULE WINAPI DrvGetModuleHandle(HDRVR); HMODULE WINAPI GetDriverModuleHandle(HDRVR); LRESULT WINAPI DefDriverProc(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM); @@ -1830,7 +1830,7 @@ BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT); BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT); BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD); -HTASK WINAPI mciGetCreatorTask(MCIDEVICEID); +HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID); YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD); typedef struct tagMCI_SEQ_SET_PARMS { Modified: branches/ros-amd64-bringup/reactos/include/psdk/msacm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] Sat Mar 21 14:07:04 2009 @@ -561,48 +561,48 @@ typedef BOOL (CALLBACK *ACMFILTERENUMCBA)( HACMDRIVERID hadid, PACMFILTERDETAILSA pafd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); typedef BOOL (CALLBACK *ACMFILTERENUMCBW)( HACMDRIVERID hadid, PACMFILTERDETAILSW pafd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); #define ACMFILTERENUMCB WINELIB_NAME_AW(ACMFILTERENUMCB) typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBA)( HACMDRIVERID hadid, PACMFILTERTAGDETAILSA paftd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBW)( HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); #define ACMFILTERTAGENUMCB WINELIB_NAME_AW(ACMFILTERTAGENUMCB) typedef BOOL (CALLBACK *ACMFORMATENUMCBA)( HACMDRIVERID hadid, PACMFORMATDETAILSA pafd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); typedef BOOL (CALLBACK *ACMFORMATENUMCBW)( HACMDRIVERID hadid, PACMFORMATDETAILSW pafd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); #define ACMFORMATENUMCB WINELIB_NAME_AW(ACMFORMATENUMCB) typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA)( HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW)( HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); #define ACMFORMATTAGENUMCB WINELIB_NAME_AW(ACMFORMATTAGENUMCB) @@ -633,7 +633,7 @@ #define acmDriverDetails WINELIB_NAME_AW(acmDriverDetails) MMRESULT WINAPI acmDriverEnum( - ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmDriverID( HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID @@ -668,11 +668,11 @@ MMRESULT WINAPI acmFilterEnumA( HACMDRIVER had, PACMFILTERDETAILSA pafd, - ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFILTERENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFilterEnumW( HACMDRIVER had, PACMFILTERDETAILSW pafd, - ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFILTERENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); #define acmFilterEnum WINELIB_NAME_AW(acmFilterEnum) @@ -686,11 +686,11 @@ MMRESULT WINAPI acmFilterTagEnumA( HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, - ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFILTERTAGENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFilterTagEnumW( HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, - ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFILTERTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); #define acmFilterTagEnum WINELIB_NAME_AW(acmFilterTagEnum) @@ -712,11 +712,11 @@ MMRESULT WINAPI acmFormatEnumA( HACMDRIVER had, PACMFORMATDETAILSA pafd, - ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFORMATENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFormatEnumW( HACMDRIVER had, PACMFORMATDETAILSW pafd, - ACMFORMATENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFORMATENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); #define acmFormatEnum WINELIB_NAME_AW(acmFormatEnum) @@ -734,11 +734,11 @@ MMRESULT WINAPI acmFormatTagEnumA( HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, - ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFORMATTAGENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFormatTagEnumW( HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, - ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFORMATTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); #define acmFormatTagEnum WINELIB_NAME_AW(acmFormatTagEnum) @@ -758,8 +758,8 @@ ); MMRESULT WINAPI acmStreamOpen( PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc, - PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback, - DWORD dwInstance, DWORD fdwOpen + PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD_PTR dwCallback, + DWORD_PTR dwInstance, DWORD fdwOpen ); MMRESULT WINAPI acmStreamPrepareHeader( HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sat Mar 21 14:07:04 2009 @@ -160,7 +160,7 @@ IN DWORD CapabilitiesSize); /* This one is for those of us who don't care */ -DEFINE_GETCAPS_FUNCTYPE(MMGETCAPS_FUNC, DWORD_PTR); +DEFINE_GETCAPS_FUNCTYPE(MMGETCAPS_FUNC, PVOID); /* These are for those of us that do */ DEFINE_GETCAPS_FUNCTYPE(MMGETWAVEOUTCAPS_FUNC, LPWAVEOUTCAPS); Removed: branches/ros-amd64-bringup/reactos/include/reactos/wine/msacm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/msacm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/msacm.h (removed) @@ -1,823 +1,0 @@ -/* - * Declarations for MSACM - * - * Copyright (C) the Wine project - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_MSACM_H -#define __WINE_MSACM_H - -#include <mmreg.h> - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - -#define ACMAPI WINAPI - -/*********************************************************************** - * Defines/Enums - */ -#define ACMERR_BASE 512 -#define ACMERR_NOTPOSSIBLE (ACMERR_BASE + 0) -#define ACMERR_BUSY (ACMERR_BASE + 1) -#define ACMERR_UNPREPARED (ACMERR_BASE + 2) -#define ACMERR_CANCELED (ACMERR_BASE + 3) - -#define MM_ACM_OPEN MM_STREAM_OPEN -#define MM_ACM_CLOSE MM_STREAM_CLOSE -#define MM_ACM_DONE MM_STREAM_DONE - -#define ACM_DRIVERADDF_FUNCTION 0x00000003L -#define ACM_DRIVERADDF_NOTIFYHWND 0x00000004L -#define ACM_DRIVERADDF_TYPEMASK 0x00000007L -#define ACM_DRIVERADDF_LOCAL 0x00000000L -#define ACM_DRIVERADDF_GLOBAL 0x00000008L - -#define ACMDRIVERDETAILS_SHORTNAME_CHARS 32 -#define ACMDRIVERDETAILS_LONGNAME_CHARS 128 -#define ACMDRIVERDETAILS_COPYRIGHT_CHARS 80 -#define ACMDRIVERDETAILS_LICENSING_CHARS 128 -#define ACMDRIVERDETAILS_FEATURES_CHARS 512 - -#define ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC mmioFOURCC('a', 'u', 'd', 'c') -#define ACMDRIVERDETAILS_FCCCOMP_UNDEFINED mmioFOURCC('\0', '\0', '\0', '\0') - -#define ACMDRIVERDETAILS_SUPPORTF_CODEC 0x00000001L -#define ACMDRIVERDETAILS_SUPPORTF_CONVERTER 0x00000002L -#define ACMDRIVERDETAILS_SUPPORTF_FILTER 0x00000004L -#define ACMDRIVERDETAILS_SUPPORTF_HARDWARE 0x00000008L -#define ACMDRIVERDETAILS_SUPPORTF_ASYNC 0x00000010L -#define ACMDRIVERDETAILS_SUPPORTF_LOCAL 0x40000000L -#define ACMDRIVERDETAILS_SUPPORTF_DISABLED 0x80000000L - -#define ACM_DRIVERENUMF_NOLOCAL 0x40000000L -#define ACM_DRIVERENUMF_DISABLED 0x80000000L - -#define ACM_DRIVERPRIORITYF_ENABLE 0x00000001L -#define ACM_DRIVERPRIORITYF_DISABLE 0x00000002L -#define ACM_DRIVERPRIORITYF_ABLEMASK 0x00000003L -#define ACM_DRIVERPRIORITYF_BEGIN 0x00010000L -#define ACM_DRIVERPRIORITYF_END 0x00020000L -#define ACM_DRIVERPRIORITYF_DEFERMASK 0x00030000L - -#define MM_ACM_FILTERCHOOSE 0x8000 - -#define FILTERCHOOSE_MESSAGE 0 -#define FILTERCHOOSE_FILTERTAG_VERIFY (FILTERCHOOSE_MESSAGE+0) -#define FILTERCHOOSE_FILTER_VERIFY (FILTERCHOOSE_MESSAGE+1) -#define FILTERCHOOSE_CUSTOM_VERIFY (FILTERCHOOSE_MESSAGE+2) - -#define ACMFILTERCHOOSE_STYLEF_SHOWHELP 0x00000004L -#define ACMFILTERCHOOSE_STYLEF_ENABLEHOOK 0x00000008L -#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATE 0x00000010L -#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATEHANDLE 0x00000020L -#define ACMFILTERCHOOSE_STYLEF_INITTOFILTERSTRUCT 0x00000040L -#define ACMFILTERCHOOSE_STYLEF_CONTEXTHELP 0x00000080L - -#define ACMFILTERDETAILS_FILTER_CHARS 128 - -#define ACM_FILTERDETAILSF_INDEX 0x00000000L -#define ACM_FILTERDETAILSF_FILTER 0x00000001L -#define ACM_FILTERDETAILSF_QUERYMASK 0x0000000FL - -#define ACMFILTERTAGDETAILS_FILTERTAG_CHARS 48 - -#define ACM_FILTERTAGDETAILSF_INDEX 0x00000000L -#define ACM_FILTERTAGDETAILSF_FILTERTAG 0x00000001L -#define ACM_FILTERTAGDETAILSF_LARGESTSIZE 0x00000002L -#define ACM_FILTERTAGDETAILSF_QUERYMASK 0x0000000FL - -#define ACM_FILTERENUMF_DWFILTERTAG 0x00010000L - -#define ACMHELPMSGSTRINGA "acmchoose_help" -#if defined(__GNUC__) -# define ACMHELPMSGSTRINGW (const WCHAR []){ 'a','c','m', \ - 'c','h','o','o','s','e','_','h','e','l','p',0 } -#elif defined(_MSC_VER) -# define ACMHELPMSGSTRINGW L"acmchoose_help" -#else -static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m', - 'c','h','o','o','s','e','_','h','e','l','p',0 }; -#endif -#define ACMHELPMSGSTRING WINELIB_NAME_AW(ACMHELPMSGSTRING) - -#define ACMHELPMSGCONTEXTMENUA "acmchoose_contextmenu" -#if defined(__GNUC__) -# define ACMHELPMSGCONTEXTMENUW (const WCHAR []){ 'a','c','m', \ - 'c','h','o','o','s','e','_','c','o','n','t','e','x','t','m','e','n','u',0 } -#elif defined(_MSC_VER) -# define ACMHELPMSGCONTEXTMENUW L"acmchoose_contextmenu" -#else -static const WCHAR ACMHELPMSGCONTEXTMENUW[] = { 'a','c','m', - 'c','h','o','o','s','e','_','c','o','n','t','e','x','t','m','e','n','u',0 }; -#endif -#define ACMHELPMSGCONTEXTMENU WINELIB_NAME_AW(ACMHELPMSGCONTEXTMENU) - -#define ACMHELPMSGCONTEXTHELPA "acmchoose_contexthelp" -#if defined(__GNUC__) -# define ACMHELPMSGCONTEXTHELPW (const WCHAR []){ 'a','c','m', \ - 'c','h','o','o','s','e','_','c','o','n','t','e','x','t','h','e','l','p',0 } -#elif defined(_MSC_VER) -# define ACMHELPMSGCONTEXTHELPW L"acmchoose_contexthelp" -#else -static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m', - 'c','h','o','o','s','e','_','c','o','n','t','e','x','t','h','e','l','p',0 }; -#endif -#define ACMHELPMSGCONTEXTHELP WINELIB_NAME_AW(ACMHELPMSGCONTEXTHELP) - -#define MM_ACM_FORMATCHOOSE 0x8000 - -#define FORMATCHOOSE_MESSAGE 0 -#define FORMATCHOOSE_FORMATTAG_VERIFY (FORMATCHOOSE_MESSAGE+0) -#define FORMATCHOOSE_FORMAT_VERIFY (FORMATCHOOSE_MESSAGE+1) -#define FORMATCHOOSE_CUSTOM_VERIFY (FORMATCHOOSE_MESSAGE+2) - -#define ACMFORMATCHOOSE_STYLEF_SHOWHELP 0x00000004L -#define ACMFORMATCHOOSE_STYLEF_ENABLEHOOK 0x00000008L -#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE 0x00000010L -#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE 0x00000020L -#define ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT 0x00000040L -#define ACMFORMATCHOOSE_STYLEF_CONTEXTHELP 0x00000080L - -#define ACMFORMATDETAILS_FORMAT_CHARS 128 - -#define ACM_FORMATDETAILSF_INDEX 0x00000000L -#define ACM_FORMATDETAILSF_FORMAT 0x00000001L -#define ACM_FORMATDETAILSF_QUERYMASK 0x0000000FL - -#define ACM_FORMATENUMF_WFORMATTAG 0x00010000L -#define ACM_FORMATENUMF_NCHANNELS 0x00020000L -#define ACM_FORMATENUMF_NSAMPLESPERSEC 0x00040000L -#define ACM_FORMATENUMF_WBITSPERSAMPLE 0x00080000L -#define ACM_FORMATENUMF_CONVERT 0x00100000L -#define ACM_FORMATENUMF_SUGGEST 0x00200000L -#define ACM_FORMATENUMF_HARDWARE 0x00400000L -#define ACM_FORMATENUMF_INPUT 0x00800000L -#define ACM_FORMATENUMF_OUTPUT 0x01000000L - -#define ACM_FORMATSUGGESTF_WFORMATTAG 0x00010000L -#define ACM_FORMATSUGGESTF_NCHANNELS 0x00020000L -#define ACM_FORMATSUGGESTF_NSAMPLESPERSEC 0x00040000L -#define ACM_FORMATSUGGESTF_WBITSPERSAMPLE 0x00080000L -#define ACM_FORMATSUGGESTF_TYPEMASK 0x00FF0000L - -#define ACMFORMATTAGDETAILS_FORMATTAG_CHARS 48 - -#define ACM_FORMATTAGDETAILSF_INDEX 0x00000000L -#define ACM_FORMATTAGDETAILSF_FORMATTAG 0x00000001L -#define ACM_FORMATTAGDETAILSF_LARGESTSIZE 0x00000002L -#define ACM_FORMATTAGDETAILSF_QUERYMASK 0x0000000FL - -#define ACM_METRIC_COUNT_DRIVERS 1 -#define ACM_METRIC_COUNT_CODECS 2 -#define ACM_METRIC_COUNT_CONVERTERS 3 -#define ACM_METRIC_COUNT_FILTERS 4 -#define ACM_METRIC_COUNT_DISABLED 5 -#define ACM_METRIC_COUNT_HARDWARE 6 -#define ACM_METRIC_COUNT_LOCAL_DRIVERS 20 -#define ACM_METRIC_COUNT_LOCAL_CODECS 21 -#define ACM_METRIC_COUNT_LOCAL_CONVERTERS 22 -#define ACM_METRIC_COUNT_LOCAL_FILTERS 23 -#define ACM_METRIC_COUNT_LOCAL_DISABLED 24 -#define ACM_METRIC_HARDWARE_WAVE_INPUT 30 -#define ACM_METRIC_HARDWARE_WAVE_OUTPUT 31 -#define ACM_METRIC_MAX_SIZE_FORMAT 50 -#define ACM_METRIC_MAX_SIZE_FILTER 51 -#define ACM_METRIC_DRIVER_SUPPORT 100 -#define ACM_METRIC_DRIVER_PRIORITY 101 - -#define ACM_STREAMCONVERTF_BLOCKALIGN 0x00000004 -#define ACM_STREAMCONVERTF_START 0x00000010 -#define ACM_STREAMCONVERTF_END 0x00000020 - -#define ACMSTREAMHEADER_STATUSF_DONE 0x00010000L -#define ACMSTREAMHEADER_STATUSF_PREPARED 0x00020000L -#define ACMSTREAMHEADER_STATUSF_INQUEUE 0x00100000L - -#define ACM_STREAMOPENF_QUERY 0x00000001 -#define ACM_STREAMOPENF_ASYNC 0x00000002 -#define ACM_STREAMOPENF_NONREALTIME 0x00000004 - -#define ACM_STREAMSIZEF_SOURCE 0x00000000L -#define ACM_STREAMSIZEF_DESTINATION 0x00000001L -#define ACM_STREAMSIZEF_QUERYMASK 0x0000000FL - -#define ACMDM_USER (DRV_USER + 0x0000) -#define ACMDM_RESERVED_LOW (DRV_USER + 0x2000) -#define ACMDM_RESERVED_HIGH (DRV_USER + 0x2FFF) - -#define ACMDM_BASE ACMDM_RESERVED_LOW - -#define ACMDM_DRIVER_ABOUT (ACMDM_BASE + 11) - -/* handles */ - -DECLARE_HANDLE(HACMDRIVERID); -DECLARE_HANDLE(HACMDRIVER); -DECLARE_HANDLE(HACMSTREAM); -DECLARE_HANDLE(HACMOBJ); -typedef HACMDRIVERID *PHACMDRIVERID, *LPHACMDRIVERID; -typedef HACMDRIVER *PHACMDRIVER, *LPHACMDRIVER; -typedef HACMSTREAM *PHACMSTREAM, *LPHACMSTREAM; -typedef HACMOBJ *PHACMOBJ, *LPHACMOBJ; - -/*********************************************************************** - * Callbacks - */ - -typedef BOOL (CALLBACK *ACMDRIVERENUMCB)( - HACMDRIVERID hadid, DWORD dwInstance, DWORD fdwSupport -); - -typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCA)( - HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam -); - -typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCW)( - HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam -); -#define ACMFILTERCHOOSEHOOKPROC WINELIB_NAME_AW(ACMFILTERCHOOSEHOOKPROC) - -typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCA)( - HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam -); - -typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCW)( - HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam -); -#define ACMFORMATCHOOSEHOOKPROC WINELIB_NAME_AW(ACMFORMATCHOOSEHOOKPROC) - -/*********************************************************************** - * Structures - */ - -typedef struct _ACMDRIVERDETAILSA -{ - DWORD cbStruct; - - FOURCC fccType; - FOURCC fccComp; - - WORD wMid; - WORD wPid; - - DWORD vdwACM; - DWORD vdwDriver; - - DWORD fdwSupport; - DWORD cFormatTags; - DWORD cFilterTags; - - HICON hicon; - - CHAR szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS]; - CHAR szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS]; - CHAR szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS]; - CHAR szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS]; - CHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; -} ACMDRIVERDETAILSA, *PACMDRIVERDETAILSA, *LPACMDRIVERDETAILSA; - -typedef struct _ACMDRIVERDETAILSW -{ - DWORD cbStruct; - - FOURCC fccType; - FOURCC fccComp; - - WORD wMid; - WORD wPid; - - DWORD vdwACM; - DWORD vdwDriver; - - DWORD fdwSupport; - DWORD cFormatTags; - DWORD cFilterTags; - - HICON hicon; - - WCHAR szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS]; - WCHAR szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS]; - WCHAR szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS]; - WCHAR szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS]; - WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; -} ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW; - -#if defined(UNICODE) || defined (_UNICODE) -typedef struct ACMDRIVERDETAILSW ACMDRIVERDETAILS; -typedef PACMDRIVERDETAILSW PACMDRIVERDETAILS; -typedef LPACMDRIVERDETAILSW LPACMDRIVERDETAILS; -#else -typedef struct ACMDRIVERDETAILSA ACMDRIVERDETAILS; -typedef PACMDRIVERDETAILSA PACMDRIVERDETAILS; -typedef LPACMDRIVERDETAILSA LPACMDRIVERDETAILS; -#endif - -typedef struct _ACMFILTERCHOOSEA -{ - DWORD cbStruct; - DWORD fdwStyle; - - HWND hwndOwner; - - PWAVEFILTER pwfltr; - DWORD cbwfltr; - - LPCSTR pszTitle; - - CHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; - CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; - LPSTR pszName; - DWORD cchName; - - DWORD fdwEnum; - PWAVEFILTER pwfltrEnum; - - HINSTANCE hInstance; - LPCSTR pszTemplateName; - LPARAM lCustData; - ACMFILTERCHOOSEHOOKPROCA pfnHook; -} ACMFILTERCHOOSEA, *PACMFILTERCHOOSEA, *LPACMFILTERCHOOSEA; - -typedef struct _ACMFILTERCHOOSEW -{ - DWORD cbStruct; - DWORD fdwStyle; - - HWND hwndOwner; - - PWAVEFILTER pwfltr; - DWORD cbwfltr; - - LPCWSTR pszTitle; - - WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; - WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; - LPWSTR pszName; - DWORD cchName; - - DWORD fdwEnum; - PWAVEFILTER pwfltrEnum; - - HINSTANCE hInstance; - LPCWSTR pszTemplateName; - LPARAM lCustData; - ACMFILTERCHOOSEHOOKPROCW pfnHook; -} ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW, *LPACMFILTERCHOOSEW; - -#if defined(UNICODE) || defined (_UNICODE) -typedef struct ACMFILTERCHOOSEW ACMFILTERCHOOSE; -typedef PACMFILTERCHOOSEW PACMFILTERCHOOSE; -typedef LPACMFILTERCHOOSEW LPACMFILTERCHOOSE; -#else -typedef struct ACMFILTERCHOOSEA ACMFILTERCHOOSE; -typedef PACMFILTERCHOOSEA PACMFILTERCHOOSE; -typedef LPACMFILTERCHOOSEA LPACMFILTERCHOOSE; -#endif - -typedef struct _ACMFILTERDETAILSA -{ - DWORD cbStruct; - DWORD dwFilterIndex; - DWORD dwFilterTag; - DWORD fdwSupport; - PWAVEFILTER pwfltr; - DWORD cbwfltr; - CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; -} ACMFILTERDETAILSA, *PACMFILTERDETAILSA, *LPACMFILTERDETAILSA; - -typedef struct _ACMFILTERDETAILSW -{ - DWORD cbStruct; - DWORD dwFilterIndex; - DWORD dwFilterTag; - DWORD fdwSupport; - PWAVEFILTER pwfltr; - DWORD cbwfltr; - WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; -} ACMFILTERDETAILSW, *PACMFILTERDETAILSW, *LPACMFILTERDETAILSW; - -#if defined(UNICODE) || defined (_UNICODE) -typedef struct ACMFILTERDETAILSW ACMFILTERDETAILS; -typedef PACMFILTERDETAILSW PACMFILTERDETAILS; -typedef LPACMFILTERDETAILSW LPACMFILTERDETAILS; -#else -typedef struct ACMFILTERDETAILSA ACMFILTERDETAILS; -typedef PACMFILTERDETAILSA PACMFILTERDETAILS; -typedef LPACMFILTERDETAILSA LPACMFILTERDETAILS; -#endif - -typedef struct _ACMFILTERTAGDETAILSA -{ - DWORD cbStruct; - DWORD dwFilterTagIndex; - DWORD dwFilterTag; - DWORD cbFilterSize; - DWORD fdwSupport; - DWORD cStandardFilters; - CHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; -} ACMFILTERTAGDETAILSA, *PACMFILTERTAGDETAILSA, *LPACMFILTERTAGDETAILSA; - -typedef struct _ACMFILTERTAGDETAILSW -{ - DWORD cbStruct; - DWORD dwFilterTagIndex; - DWORD dwFilterTag; - DWORD cbFilterSize; - DWORD fdwSupport; - DWORD cStandardFilters; - WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; -} ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW, *LPACMFILTERTAGDETAILSW; - -#if defined(UNICODE) || defined (_UNICODE) -typedef struct ACMFILTERTAGDETAILSW ACMFILTERTAGDETAILS; -typedef PACMFILTERTAGDETAILSW PACMFILTERTAGDETAILS; -typedef LPACMFILTERTAGDETAILSW LPACMFILTERTAGDETAILS; -#else -typedef struct ACMFILTERTAGDETAILSA ACMFILTERTAGDETAILS; -typedef PACMFILTERTAGDETAILSA PACMFILTERTAGDETAILS; -typedef LPACMFILTERTAGDETAILSA LPACMFILTERTAGDETAILS; -#endif - -typedef struct _ACMFORMATCHOOSEA -{ - DWORD cbStruct; - DWORD fdwStyle; - - HWND hwndOwner; - - PWAVEFORMATEX pwfx; - DWORD cbwfx; - LPCSTR pszTitle; - - CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; - CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; - - LPSTR pszName; - DWORD cchName; - - DWORD fdwEnum; - PWAVEFORMATEX pwfxEnum; - - HINSTANCE hInstance; - LPCSTR pszTemplateName; - LPARAM lCustData; - ACMFORMATCHOOSEHOOKPROCA pfnHook; -} ACMFORMATCHOOSEA, *PACMFORMATCHOOSEA, *LPACMFORMATCHOOSEA; - -typedef struct _ACMFORMATCHOOSEW -{ - DWORD cbStruct; - DWORD fdwStyle; - - HWND hwndOwner; - - PWAVEFORMATEX pwfx; - DWORD cbwfx; - LPCWSTR pszTitle; - - WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; - WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; - - LPWSTR pszName; - DWORD cchName; - - DWORD fdwEnum; - LPWAVEFORMATEX pwfxEnum; - - HINSTANCE hInstance; - LPCWSTR pszTemplateName; - LPARAM lCustData; - ACMFORMATCHOOSEHOOKPROCW pfnHook; -} ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW, *LPACMFORMATCHOOSEW; - -#if defined(UNICODE) || defined (_UNICODE) -typedef struct ACMFORMATCHOOSEW ACMFORMATCHOOSE; -typedef PACMFORMATCHOOSEW PACMFORMATCHOOSE; -typedef LPACMFORMATCHOOSEW LPACMFORMATCHOOSE; -#else -typedef struct ACMFORMATCHOOSEA ACMFORMATCHOOSE; -typedef PACMFORMATCHOOSEA PACMFORMATCHOOSE; -typedef LPACMFORMATCHOOSEA LPACMFORMATCHOOSE; -#endif - -typedef struct _ACMFORMATDETAILSA -{ - DWORD cbStruct; - DWORD dwFormatIndex; - DWORD dwFormatTag; - DWORD fdwSupport; - PWAVEFORMATEX pwfx; - DWORD cbwfx; - CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; -} ACMFORMATDETAILSA, *PACMFORMATDETAILSA, *LPACMFORMATDETAILSA; - -typedef struct _ACMFORMATDETAILSW -{ - DWORD cbStruct; - DWORD dwFormatIndex; - DWORD dwFormatTag; - DWORD fdwSupport; - PWAVEFORMATEX pwfx; - DWORD cbwfx; - WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; -} ACMFORMATDETAILSW, *PACMFORMATDETAILSW, *LPACMFORMATDETAILSW; - -#if defined(UNICODE) || defined (_UNICODE) -typedef struct ACMFORMATDETAILSW ACMFORMATDETAILS; -typedef PACMFORMATDETAILSW PACMFORMATDETAILS; -typedef LPACMFORMATDETAILSW LPACMFORMATDETAILS; -#else -typedef struct ACMFORMATDETAILSA ACMFORMATDETAILS; -typedef PACMFORMATDETAILSA PACMFORMATDETAILS; -typedef LPACMFORMATDETAILSA LPACMFORMATDETAILS; -#endif - -typedef struct _ACMFORMATTAGDETAILSA -{ - DWORD cbStruct; - DWORD dwFormatTagIndex; - DWORD dwFormatTag; - DWORD cbFormatSize; - DWORD fdwSupport; - DWORD cStandardFormats; - CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; -} ACMFORMATTAGDETAILSA, *PACMFORMATTAGDETAILSA, *LPACMFORMATTAGDETAILSA; - -typedef struct _ACMFORMATTAGDETAILSW -{ - DWORD cbStruct; - DWORD dwFormatTagIndex; - DWORD dwFormatTag; - DWORD cbFormatSize; - DWORD fdwSupport; - DWORD cStandardFormats; - WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; -} ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW; - -#if defined(UNICODE) || defined (_UNICODE) -typedef struct ACMFORMATTAGDETAILSW ACMFORMATTAGDETAILS; -typedef PACMFORMATTAGDETAILSW PACMFORMATTAGDETAILS; -typedef LPACMFORMATTAGDETAILSW LPACMFORMATTAGDETAILS; -#else -typedef struct ACMFORMATTAGDETAILSA ACMFORMATTAGDETAILS; -typedef PACMFORMATTAGDETAILSA PACMFORMATTAGDETAILS; -typedef LPACMFORMATTAGDETAILSA LPACMFORMATTAGDETAILS; -#endif - -typedef struct _ACMSTREAMHEADER -{ - DWORD cbStruct; - DWORD fdwStatus; - DWORD dwUser; - LPBYTE pbSrc; - DWORD cbSrcLength; - DWORD cbSrcLengthUsed; - DWORD dwSrcUser; - LPBYTE pbDst; - DWORD cbDstLength; - DWORD cbDstLengthUsed; - DWORD dwDstUser; - DWORD dwReservedDriver[10]; -} ACMSTREAMHEADER, *PACMSTREAMHEADER, *LPACMSTREAMHEADER; - -/*********************************************************************** - * Callbacks 2 - */ - -typedef BOOL (CALLBACK *ACMFILTERENUMCBA)( - HACMDRIVERID hadid, PACMFILTERDETAILSA pafd, - DWORD dwInstance, DWORD fdwSupport -); - -typedef BOOL (CALLBACK *ACMFILTERENUMCBW)( - HACMDRIVERID hadid, PACMFILTERDETAILSW pafd, - DWORD dwInstance, DWORD fdwSupport -); - -#define ACMFILTERENUMCB WINELIB_NAME_AW(ACMFILTERENUMCB) - -typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBA)( - HACMDRIVERID hadid, PACMFILTERTAGDETAILSA paftd, - DWORD dwInstance, DWORD fdwSupport -); - -typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBW)( - HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftd, - DWORD dwInstance, DWORD fdwSupport -); - -#define ACMFILTERTAGENUMCB WINELIB_NAME_AW(ACMFILTERTAGENUMCB) - -typedef BOOL (CALLBACK *ACMFORMATENUMCBA)( - HACMDRIVERID hadid, PACMFORMATDETAILSA pafd, - DWORD dwInstance, DWORD fdwSupport -); - -typedef BOOL (CALLBACK *ACMFORMATENUMCBW)( - HACMDRIVERID hadid, PACMFORMATDETAILSW pafd, - DWORD dwInstance, DWORD fdwSupport -); - -#define ACMFORMATENUMCB WINELIB_NAME_AW(ACMFORMATENUMCB) - -typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA)( - HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd, - DWORD dwInstance, DWORD fdwSupport -); - -typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW)( - HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftd, - DWORD dwInstance, DWORD fdwSupport -); - -#define ACMFORMATTAGENUMCB WINELIB_NAME_AW(ACMFORMATTAGENUMCB) - -/*********************************************************************** - * Functions - Win32 - */ - -MMRESULT WINAPI acmDriverAddA( - PHACMDRIVERID phadid, HINSTANCE hinstModule, - LPARAM lParam, DWORD dwPriority, DWORD fdwAdd -); -MMRESULT WINAPI acmDriverAddW( - PHACMDRIVERID phadid, HINSTANCE hinstModule, - LPARAM lParam, DWORD dwPriority, DWORD fdwAdd -); -#define acmDriverAdd WINELIB_NAME_AW(acmDriverAdd) - -MMRESULT WINAPI acmDriverClose( - HACMDRIVER had, DWORD fdwClose -); -MMRESULT WINAPI acmDriverDetailsA( - HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, DWORD fdwDetails -); -MMRESULT WINAPI acmDriverDetailsW( - HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, DWORD fdwDetails -); -#define acmDriverDetails WINELIB_NAME_AW(acmDriverDetails) - -MMRESULT WINAPI acmDriverEnum( - ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum -); -MMRESULT WINAPI acmDriverID( - HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID -); -LRESULT WINAPI acmDriverMessage( - HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2 -); -MMRESULT WINAPI acmDriverOpen( - PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpen -); -MMRESULT WINAPI acmDriverPriority( - HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority -); -MMRESULT WINAPI acmDriverRemove( - HACMDRIVERID hadid, DWORD fdwRemove -); -MMRESULT WINAPI acmFilterChooseA( - PACMFILTERCHOOSEA pafltrc -); -MMRESULT WINAPI acmFilterChooseW( - PACMFILTERCHOOSEW pafltrc -); -#define acmFilterChoose WINELIB_NAME_AW(acmFilterChoose) - -MMRESULT WINAPI acmFilterDetailsA( - HACMDRIVER had, PACMFILTERDETAILSA pafd, DWORD fdwDetails -); -MMRESULT WINAPI acmFilterDetailsW( - HACMDRIVER had, PACMFILTERDETAILSW pafd, DWORD fdwDetails -); -#define acmFilterDetails WINELIB_NAME_AW(acmFilterDetails) - -MMRESULT WINAPI acmFilterEnumA( - HACMDRIVER had, PACMFILTERDETAILSA pafd, - ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum -); -MMRESULT WINAPI acmFilterEnumW( - HACMDRIVER had, PACMFILTERDETAILSW pafd, - ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum -); -#define acmFilterEnum WINELIB_NAME_AW(acmFilterEnum) - -MMRESULT WINAPI acmFilterTagDetailsA( - HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, DWORD fdwDetails -); -MMRESULT WINAPI acmFilterTagDetailsW( - HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, DWORD fdwDetails -); -#define acmFilterTagDetails WINELIB_NAME_AW(acmFilterTagDetails) - -MMRESULT WINAPI acmFilterTagEnumA( - HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, - ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum -); -MMRESULT WINAPI acmFilterTagEnumW( - HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, - ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum -); -#define acmFilterTagEnum WINELIB_NAME_AW(acmFilterTagEnum) - -MMRESULT WINAPI acmFormatChooseA( - PACMFORMATCHOOSEA pafmtc -); -MMRESULT WINAPI acmFormatChooseW( - PACMFORMATCHOOSEW pafmtc -); -#define acmFormatChoose WINELIB_NAME_AW(acmFormatChoose) - -MMRESULT WINAPI acmFormatDetailsA( - HACMDRIVER had, PACMFORMATDETAILSA pafd, DWORD fdwDetails -); -MMRESULT WINAPI acmFormatDetailsW( - HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails -); -#define acmFormatDetails WINELIB_NAME_AW(acmFormatDetails) - -MMRESULT WINAPI acmFormatEnumA( - HACMDRIVER had, PACMFORMATDETAILSA pafd, - ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum -); -MMRESULT WINAPI acmFormatEnumW( - HACMDRIVER had, PACMFORMATDETAILSW pafd, - ACMFORMATENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum -); -#define acmFormatEnum WINELIB_NAME_AW(acmFormatEnum) - -MMRESULT WINAPI acmFormatSuggest( - HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst, - DWORD cbwfxDst, DWORD fdwSuggest -); -MMRESULT WINAPI acmFormatTagDetailsA( - HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, DWORD fdwDetails -); -MMRESULT WINAPI acmFormatTagDetailsW( - HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, DWORD fdwDetails -); -#define acmFormatTagDetails WINELIB_NAME_AW(acmFormatTagDetails) - -MMRESULT WINAPI acmFormatTagEnumA( - HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, - ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum -); -MMRESULT WINAPI acmFormatTagEnumW( - HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, - ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum -); -#define acmFormatTagEnum WINELIB_NAME_AW(acmFormatTagEnum) - -DWORD WINAPI acmGetVersion(void -); -MMRESULT WINAPI acmMetrics( - HACMOBJ hao, UINT uMetric, LPVOID pMetric -); -MMRESULT WINAPI acmStreamClose( - HACMSTREAM has, DWORD fdwClose -); -MMRESULT WINAPI acmStreamConvert( - HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwConvert -); -MMRESULT WINAPI acmStreamMessage( - HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2 -); -MMRESULT WINAPI acmStreamOpen( - PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc, - PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback, - DWORD dwInstance, DWORD fdwOpen -); -MMRESULT WINAPI acmStreamPrepareHeader( - HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare -); -MMRESULT WINAPI acmStreamReset( - HACMSTREAM has, DWORD fdwReset -); -MMRESULT WINAPI acmStreamSize( - HACMSTREAM has, DWORD cbInput, - LPDWORD pdwOutputBytes, DWORD fdwSize -); -MMRESULT WINAPI acmStreamUnprepareHeader( - HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare -); - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* __WINE_MSACM_H */ Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/msacmdrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/msacmdrv.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/msacmdrv.h [iso-8859-1] Sat Mar 21 14:07:04 2009 @@ -38,7 +38,7 @@ */ #define MAKE_ACM_VERSION(mjr, mnr, bld) \ - (((long)(mjr)<<24) | ((long)(mnr)<<16) | ((long)bld)) + (((LONG)(mjr)<<24) | ((LONG)(mnr)<<16) | ((LONG)bld)) #define ACMDRVOPENDESC_SECTIONNAME_CHARS @@ -100,40 +100,40 @@ PWAVEFORMATEX pwfxSrc; PWAVEFORMATEX pwfxDst; PWAVEFILTER pwfltr; - DWORD dwCallback; - DWORD dwInstance; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; DWORD fdwOpen; DWORD fdwDriver; - DWORD dwDriver; + DWORD_PTR dwDriver; HACMSTREAM has; } ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE; typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER; typedef struct _ACMDRVSTREAMHEADER { - DWORD cbStruct; - DWORD fdwStatus; - DWORD dwUser; - LPBYTE pbSrc; - DWORD cbSrcLength; - DWORD cbSrcLengthUsed; - DWORD dwSrcUser; - LPBYTE pbDst; - DWORD cbDstLength; - DWORD cbDstLengthUsed; - DWORD dwDstUser; + DWORD cbStruct; + DWORD fdwStatus; + DWORD_PTR dwUser; + LPBYTE pbSrc; + DWORD cbSrcLength; + DWORD cbSrcLengthUsed; + DWORD_PTR dwSrcUser; + LPBYTE pbDst; + DWORD cbDstLength; + DWORD cbDstLengthUsed; + DWORD_PTR dwDstUser; - DWORD fdwConvert; + DWORD fdwConvert; PACMDRVSTREAMHEADER *padshNext; - DWORD fdwDriver; - DWORD dwDriver; + DWORD fdwDriver; + DWORD_PTR dwDriver; /* Internal fields for ACM */ - DWORD fdwPrepared; - DWORD dwPrepared; - LPBYTE pbPreparedSrc; - DWORD cbPreparedSrcLength; - LPBYTE pbPreparedDst; - DWORD cbPreparedDstLength; + DWORD fdwPrepared; + DWORD_PTR dwPrepared; + LPBYTE pbPreparedSrc; + DWORD cbPreparedSrcLength; + LPBYTE pbPreparedDst; + DWORD cbPreparedDstLength; } ACMDRVSTREAMHEADER; typedef struct _ACMDRVSTREAMSIZE

16 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs