Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[akhaldi] 69687: [HDWWIZ][NEWDEV] Fix mismatched titles. By Jared Smudde. CORE-10399

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 25 10:38:15 2015 New Revision: 69687 URL: http://svn.reactos.org/svn/reactos?rev=69687&view=rev Log: [HDWWIZ][NEWDEV] Fix mismatched titles. By Jared Smudde. CORE-10399 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc trunk/reactos/dll/win32/newdev/lang/bg-BG.rc trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc trunk/reactos/dll/win32/newdev/lang/el-GR.rc trunk/reactos/dll/win32/newdev/lang/en-US.rc trunk/reactos/dll/win32/newdev/lang/fr-FR.rc trunk/reactos/dll/win32/newdev/lang/he-IL.rc trunk/reactos/dll/win32/newdev/lang/hu-HU.rc trunk/reactos/dll/win32/newdev/lang/id-ID.rc trunk/reactos/dll/win32/newdev/lang/it-IT.rc trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/newdev/lang/nl-NL.rc trunk/reactos/dll/win32/newdev/lang/no-NO.rc trunk/reactos/dll/win32/newdev/lang/sk-SK.rc trunk/reactos/dll/win32/newdev/lang/sq-AL.rc trunk/reactos/dll/win32/newdev/lang/th-TH.rc trunk/reactos/dll/win32/newdev/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -135,7 +135,7 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Add hardware" + IDS_CPLNAME "Add Hardware" IDS_CPLDESCRIPTION "Add hardware to your computer." IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/bg-BG.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -88,8 +88,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -93,8 +93,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/el-GR.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -88,8 +88,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/en-US.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -88,8 +88,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/fr-FR.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -88,8 +88,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/he-IL.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -88,8 +88,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/hu-H… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/hu-HU.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -90,8 +90,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/id-ID.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -88,8 +88,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/it-IT.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -90,8 +90,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -88,8 +88,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/nl-N… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/nl-NL.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -95,8 +95,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/no-NO.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -90,8 +90,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/sk-SK.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -93,8 +93,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/sq-AL.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -92,8 +92,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/th-T… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/th-TH.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -90,8 +90,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." Modified: trunk/reactos/dll/win32/newdev/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/uk-UA.rc [iso-8859-1] Sun Oct 25 10:38:15 2015 @@ -96,8 +96,8 @@ STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" + IDS_INSTALLWIZARDTITLE "New Hardware Wizard" + IDS_UPDATEWIZARDTITLE "Update Driver Wizard" IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..."

9 years, 2 months

[pschweitzer] 69686: [EXT2] Import missing parameters for Ext2 driver. This fixes extX volumes being only available in read-only on ReactOS. CORE-10272 #comment Fixed with r69686

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Oct 25 10:17:04 2015 New Revision: 69686 URL: http://svn.reactos.org/svn/reactos?rev=69686&view=rev Log: [EXT2] Import missing parameters for Ext2 driver. This fixes extX volumes being only available in read-only on ReactOS. CORE-10272 #comment Fixed with r69686 Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Oct 25 10:17:04 2015 @@ -1934,6 +1934,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2fs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","CodePage",0x00000000,"default" +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","WritingSupport",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","CheckingBitmap",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","Ext3ForceWriting",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","AutoMount",0x00010001,0x00000001 ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001

9 years, 2 months

[akhaldi] 69685: [WMVCORE] Import from Wine Staging 1.7.47. CORE-10400

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 25 10:07:44 2015 New Revision: 69685 URL: http://svn.reactos.org/svn/reactos?rev=69685&view=rev Log: [WMVCORE] Import from Wine Staging 1.7.47. CORE-10400 Added: trunk/reactos/dll/win32/wmvcore/ (with props) trunk/reactos/dll/win32/wmvcore/CMakeLists.txt (with props) trunk/reactos/dll/win32/wmvcore/wmvcore.h (with props) trunk/reactos/dll/win32/wmvcore/wmvcore.spec (with props) trunk/reactos/dll/win32/wmvcore/wmvcore_main.c (with props) trunk/reactos/dll/win32/wmvcore/writer.c (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sun Oct 25 10:07:44 2015 @@ -241,6 +241,7 @@ add_subdirectory(wldap32) add_subdirectory(wmi) add_subdirectory(wmiutils) +add_subdirectory(wmvcore) add_subdirectory(ws2_32) add_subdirectory(ws2_32_new) add_subdirectory(ws2help) Propchange: trunk/reactos/dll/win32/wmvcore/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 25 10:07:44 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/wmvcore/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/wmvcore/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/wmvcore/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/wmvcore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wmvcore/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/wmvcore/CMakeLists.txt [iso-8859-1] Sun Oct 25 10:07:44 2015 @@ -0,0 +1,16 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +spec2def(wmvcore.dll wmvcore.spec) + +list(APPEND SOURCE + wmvcore_main.c + writer.c + ${CMAKE_CURRENT_BINARY_DIR}/wmvcore_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/wmvcore.def) + +add_library(wmvcore SHARED ${SOURCE}) +set_module_type(wmvcore win32dll) +target_link_libraries(wmvcore wine) +add_importlibs(wmvcore msvcrt kernel32 ntdll) +add_cd_file(TARGET wmvcore DESTINATION reactos/system32/wbem FOR all) Propchange: trunk/reactos/dll/win32/wmvcore/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wmvcore/wmvcore.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/wmvcore.… ============================================================================== --- trunk/reactos/dll/win32/wmvcore/wmvcore.h (added) +++ trunk/reactos/dll/win32/wmvcore/wmvcore.h [iso-8859-1] Sun Oct 25 10:07:44 2015 @@ -0,0 +1,36 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#define EXTERN_GUID DEFINE_GUID + +#include "windef.h" +#include "winbase.h" + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} Propchange: trunk/reactos/dll/win32/wmvcore/wmvcore.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wmvcore/wmvcore.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/wmvcore.… ============================================================================== --- trunk/reactos/dll/win32/wmvcore/wmvcore.spec (added) +++ trunk/reactos/dll/win32/wmvcore/wmvcore.spec [iso-8859-1] Sun Oct 25 10:07:44 2015 @@ -0,0 +1,20 @@ +@ stub WMCheckURLExtension +@ stub WMCheckURLScheme +@ stub WMCreateBackupRestorerPrivate +@ stub WMCreateSyncReaderPriv +@ stub WMIsAvailableOffline +@ stub WMValidateData +@ stdcall -private DllRegisterServer() +@ stub WMCreateBackupRestorer +@ stdcall WMCreateEditor(ptr) +@ stub WMCreateIndexer +@ stdcall WMCreateProfileManager(ptr) +@ stdcall WMCreateReader(ptr long ptr) +@ stub WMCreateReaderPriv +@ stdcall WMCreateSyncReader(ptr long ptr) +@ stdcall WMCreateWriter(ptr ptr) +@ stub WMCreateWriterFileSink +@ stub WMCreateWriterNetworkSink +@ stub WMCreateWriterPriv +@ stub WMCreateWriterPushSink +@ stub WMIsContentProtected Propchange: trunk/reactos/dll/win32/wmvcore/wmvcore.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wmvcore/wmvcore_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/wmvcore_… ============================================================================== --- trunk/reactos/dll/win32/wmvcore/wmvcore_main.c (added) +++ trunk/reactos/dll/win32/wmvcore/wmvcore_main.c [iso-8859-1] Sun Oct 25 10:07:44 2015 @@ -0,0 +1,800 @@ +/* + * Copyright 2012 Austin English + * + * 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 + */ + +#include "wmvcore.h" + +#include "initguid.h" +#include "wmsdkidl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("(): stub\n"); + + return S_OK; +} + +HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) +{ + FIXME("(%p): stub\n", editor); + + *editor = NULL; + + return E_NOTIMPL; +} + +typedef struct { + IWMReader IWMReader_iface; + IWMReaderAdvanced6 IWMReaderAdvanced6_iface; + LONG ref; +} WMReader; + +static inline WMReader *impl_from_IWMReader(IWMReader *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReader_iface); +} + +static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReader(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else if(IsEqualGUID(riid, &IID_IWMReader)) { + TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced)) { + TRACE("(%p)->(IID_IWMReaderAdvanced %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced2)) { + TRACE("(%p)->(IID_IWMReaderAdvanced2 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced3)) { + TRACE("(%p)->(IID_IWMReaderAdvanced3 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced4)) { + TRACE("(%p)->(IID_IWMReaderAdvanced4 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced5)) { + TRACE("(%p)->(IID_IWMReaderAdvanced5 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) { + TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv); + *ppv = &This->IWMReaderAdvanced6_iface; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMReader_AddRef(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMReader_Release(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Close(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%p)\n", This, outputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, formats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %s %f %p)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Stop(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Pause(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Resume(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMReaderVtbl WMReaderVtbl = { + WMReader_QueryInterface, + WMReader_AddRef, + WMReader_Release, + WMReader_Open, + WMReader_Close, + WMReader_GetOutputCount, + WMReader_GetOutputProps, + WMReader_SetOutputProps, + WMReader_GetOutputFormatCount, + WMReader_GetOutputFormat, + WMReader_Start, + WMReader_Stop, + WMReader_Pause, + WMReader_Resume +}; + +static inline WMReader *impl_from_IWMReaderAdvanced6(IWMReaderAdvanced6 *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderAdvanced6_iface); +} + +static HRESULT WINAPI WMReaderAdvanced_QueryInterface(IWMReaderAdvanced6 *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI WMReaderAdvanced_AddRef(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI WMReaderAdvanced_Release(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI WMReaderAdvanced_SetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL user_clock) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%x)\n", This, user_clock); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL *user_clock) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, user_clock); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_DeliverTime(IWMReaderAdvanced6 *iface, QWORD time) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(time)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL selection) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%x)\n", This, selection); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL *selection) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, selection); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *iface, WORD stream_count, + WORD *stream_numbers, WMT_STREAM_SELECTION *selections) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p %p)\n", This, stream_count, stream_numbers, selections); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface, WORD stream_num, + WMT_STREAM_SELECTION *selection) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, stream_num, selection); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL get_callbacks) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%x)\n", This, get_callbacks); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL *get_callbacks) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, get_callbacks); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num, + BOOL receive_stream_samples) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %x)\n", This, stream_num, receive_stream_samples); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num, + BOOL *receive_stream_samples) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, stream_num, receive_stream_samples); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL allocate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %x)\n", This, output_num, allocate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output_num, allocate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL allocate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %x)\n", This, output_num, allocate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL *allocate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output_num, allocate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetStatistics(IWMReaderAdvanced6 *iface, WM_READER_STATISTICS *statistics) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, statistics); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_SetClientInfo(IWMReaderAdvanced6 *iface, WM_READER_CLIENTINFO *client_info) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, client_info); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetMaxOutputSampleSize(IWMReaderAdvanced6 *iface, DWORD output, DWORD *max) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_GetMaxStreamSampleSize(IWMReaderAdvanced6 *iface, WORD stream, DWORD *max) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, stream, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced_NotifyLateDelivery(IWMReaderAdvanced6 *iface, QWORD lateness) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(lateness)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_SetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE mode) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d)\n", This, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE *mode) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetBufferProgress(IWMReaderAdvanced6 *iface, DWORD *percent, QWORD *buffering) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p)\n", This, percent, buffering); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetDownloadProgress(IWMReaderAdvanced6 *iface, DWORD *percent, + QWORD *bytes_downloaded, QWORD *download) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p %p)\n", This, percent, bytes_downloaded, download); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetSaveAsProgress(IWMReaderAdvanced6 *iface, DWORD *percent) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, percent); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_SaveFileAs(IWMReaderAdvanced6 *iface, const WCHAR *filename) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(filename)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetProtocolName(IWMReaderAdvanced6 *iface, WCHAR *protocol, DWORD *protocol_len) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p)\n", This, protocol, protocol_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_StartAtMarker(IWMReaderAdvanced6 *iface, WORD marker_index, + QWORD duration, float rate, void *context) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %s %f %p)\n", This, marker_index, wine_dbgstr_longlong(duration), rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num, + const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %s %p %p %p)\n", This, output_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_SetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num, + const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %s %d %p %d)\n", This, output_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_Preroll(IWMReaderAdvanced6 *iface, QWORD start, QWORD duration, float rate) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s %s %f)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_SetLogClientID(IWMReaderAdvanced6 *iface, BOOL log_client_id) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%x)\n", This, log_client_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_GetLogClientID(IWMReaderAdvanced6 *iface, BOOL *log_client_id) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, log_client_id); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_StopBuffering(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, IStream *stream, + IWMReaderCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p %p)\n", This, stream, callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced3_StopNetStreaming(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced3_StartAtPosition(IWMReaderAdvanced6 *iface, WORD stream_num, + void *offset_start, void *duration, WMT_OFFSET_FORMAT format, float rate, void *context) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p %p %d %f %p)\n", This, stream_num, offset_start, duration, format, rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_GetLanguageCount(IWMReaderAdvanced6 *iface, DWORD output_num, WORD *language_count) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output_num, language_count); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_GetLanguage(IWMReaderAdvanced6 *iface, DWORD output_num, + WORD language, WCHAR *language_string, WORD *language_string_len) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %x %p %p)\n", This, output_num, language, language_string, language_string_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_GetMaxSpeedFactor(IWMReaderAdvanced6 *iface, double *factor) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, factor); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_IsUsingFastCache(IWMReaderAdvanced6 *iface, BOOL *using_fast_cache) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, using_fast_cache); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_AddLogParam(IWMReaderAdvanced6 *iface, const WCHAR *namespace, + const WCHAR *name, const WCHAR *value) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%s %s %s)\n", This, debugstr_w(namespace), debugstr_w(name), debugstr_w(value)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_SendLogParams(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_CanSaveFileAs(IWMReaderAdvanced6 *iface, BOOL *can_save) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p)\n", This, can_save); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_CancelSaveFileAs(IWMReaderAdvanced6 *iface) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced4_GetURL(IWMReaderAdvanced6 *iface, WCHAR *url, DWORD *url_len) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %p)\n", This, url, url_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface, DWORD output_num, IWMPlayerHook *hook) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%d %p)\n", This, output_num, hook); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReaderAdvanced6_SetProtextStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert, + DWORD cert_size, DWORD cert_type, DWORD flags, BYTE *initialization_vector, DWORD *initialization_vector_size) +{ + WMReader *This = impl_from_IWMReaderAdvanced6(iface); + FIXME("(%p)->(%p %d %d %x %p %p)\n", This, cert, cert_size, cert_type, flags, initialization_vector, + initialization_vector_size); + return E_NOTIMPL; +} + +static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = { + WMReaderAdvanced_QueryInterface, + WMReaderAdvanced_AddRef, + WMReaderAdvanced_Release, + WMReaderAdvanced_SetUserProvidedClock, + WMReaderAdvanced_GetUserProvidedClock, + WMReaderAdvanced_DeliverTime, + WMReaderAdvanced_SetManualStreamSelection, + WMReaderAdvanced_GetManualStreamSelection, + WMReaderAdvanced_SetStreamsSelected, + WMReaderAdvanced_GetStreamSelected, + WMReaderAdvanced_SetReceiveSelectionCallbacks, + WMReaderAdvanced_GetReceiveSelectionCallbacks, + WMReaderAdvanced_SetReceiveStreamSamples, + WMReaderAdvanced_GetReceiveStreamSamples, + WMReaderAdvanced_SetAllocateForOutput, + WMReaderAdvanced_GetAllocateForOutput, + WMReaderAdvanced_SetAllocateForStream, + WMReaderAdvanced_GetAllocateForStream, + WMReaderAdvanced_GetStatistics, + WMReaderAdvanced_SetClientInfo, + WMReaderAdvanced_GetMaxOutputSampleSize, + WMReaderAdvanced_GetMaxStreamSampleSize, + WMReaderAdvanced_NotifyLateDelivery, + WMReaderAdvanced2_SetPlayMode, + WMReaderAdvanced2_GetPlayMode, + WMReaderAdvanced2_GetBufferProgress, + WMReaderAdvanced2_GetDownloadProgress, + WMReaderAdvanced2_GetSaveAsProgress, + WMReaderAdvanced2_SaveFileAs, + WMReaderAdvanced2_GetProtocolName, + WMReaderAdvanced2_StartAtMarker, + WMReaderAdvanced2_GetOutputSetting, + WMReaderAdvanced2_SetOutputSetting, + WMReaderAdvanced2_Preroll, + WMReaderAdvanced2_SetLogClientID, + WMReaderAdvanced2_GetLogClientID, + WMReaderAdvanced2_StopBuffering, + WMReaderAdvanced2_OpenStream, + WMReaderAdvanced3_StopNetStreaming, + WMReaderAdvanced3_StartAtPosition, + WMReaderAdvanced4_GetLanguageCount, + WMReaderAdvanced4_GetLanguage, + WMReaderAdvanced4_GetMaxSpeedFactor, + WMReaderAdvanced4_IsUsingFastCache, + WMReaderAdvanced4_AddLogParam, + WMReaderAdvanced4_SendLogParams, + WMReaderAdvanced4_CanSaveFileAs, + WMReaderAdvanced4_CancelSaveFileAs, + WMReaderAdvanced4_GetURL, + WMReaderAdvanced5_SetPlayerHook, + WMReaderAdvanced6_SetProtextStreamSamples +}; + +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) +{ + WMReader *reader; + + TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); + + reader = heap_alloc(sizeof(*reader)); + if(!reader) + return E_OUTOFMEMORY; + + reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; + reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; + reader->ref = 1; + + *ret_reader = &reader->IWMReader_iface; + return S_OK; +} + +HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) +{ + FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader); + + *syncreader = NULL; + + return E_NOTIMPL; +} + +typedef struct { + IWMProfileManager IWMProfileManager_iface; + LONG ref; +} WMProfileManager; + +static inline WMProfileManager *impl_from_IWMProfileManager(IWMProfileManager *iface) +{ + return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager_iface); +} + +static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, REFIID riid, void **ppv) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMProfileManager_iface; + }else if(IsEqualGUID(&IID_IWMProfileManager, riid)) { + TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); + *ppv = &This->IWMProfileManager_iface; + }else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager *iface, WMT_VERSION version, IWMProfile **ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%x %p)\n", This, version, ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager *iface, REFGUID guid, IWMProfile **ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(guid), ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager *iface, const WCHAR *profile, IWMProfile **ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(profile), ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%p %p %p)\n", This, profile, profile_str, len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager *iface, DWORD *ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%p)\n", This, ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager *iface, DWORD index, IWMProfile **ret) +{ + WMProfileManager *This = impl_from_IWMProfileManager(iface); + FIXME("(%p)->(%d %p)\n", This, index, ret); + return E_NOTIMPL; +} + +static const IWMProfileManagerVtbl WMProfileManagerVtbl = { + WMProfileManager_QueryInterface, + WMProfileManager_AddRef, + WMProfileManager_Release, + WMProfileManager_CreateEmptyProfile, + WMProfileManager_LoadProfileByID, + WMProfileManager_LoadProfileByData, + WMProfileManager_SaveProfile, + WMProfileManager_GetSystemProfileCount, + WMProfileManager_LoadSystemProfile +}; + +HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) +{ + WMProfileManager *profile_mgr; + + TRACE("(%p)\n", ret); + + profile_mgr = heap_alloc(sizeof(*profile_mgr)); + if(!profile_mgr) + return E_OUTOFMEMORY; + + profile_mgr->IWMProfileManager_iface.lpVtbl = &WMProfileManagerVtbl; + profile_mgr->ref = 1; + + *ret = &profile_mgr->IWMProfileManager_iface; + return S_OK; +} Propchange: trunk/reactos/dll/win32/wmvcore/wmvcore_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wmvcore/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/writer.c… ============================================================================== --- trunk/reactos/dll/win32/wmvcore/writer.c (added) +++ trunk/reactos/dll/win32/wmvcore/writer.c [iso-8859-1] Sun Oct 25 10:07:44 2015 @@ -0,0 +1,371 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include "wmvcore.h" +#include "wmsdkidl.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); + +typedef struct { + IWMWriter IWMWriter_iface; + IWMWriterAdvanced3 IWMWriterAdvanced3_iface; + LONG ref; +} WMWriter; + +static inline WMWriter *impl_from_IWMWriter(IWMWriter *iface) +{ + return CONTAINING_RECORD(iface, WMWriter, IWMWriter_iface); +} + +static HRESULT WINAPI WMWriter_QueryInterface(IWMWriter *iface, REFIID riid, void **ppv) +{ + WMWriter *This = impl_from_IWMWriter(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMWriter_iface; + }else if(IsEqualGUID(&IID_IWMWriter, riid)) { + TRACE("(%p)->(IID_IWMWriter %p)\n", This, ppv); + *ppv = &This->IWMWriter_iface; + }else if(IsEqualGUID(&IID_IWMWriterAdvanced, riid)) { + TRACE("(%p)->(IID_IWMWriterAdvanced %p)\n", This, ppv); + *ppv = &This->IWMWriterAdvanced3_iface; + }else if(IsEqualGUID(&IID_IWMWriterAdvanced2, riid)) { + TRACE("(%p)->(IID_IWMWriterAdvanced2 %p)\n", This, ppv); + *ppv = &This->IWMWriterAdvanced3_iface; + }else if(IsEqualGUID(&IID_IWMWriterAdvanced3, riid)) { + TRACE("(%p)->(IID_IWMWriterAdvanced3 %p)\n", This, ppv); + *ppv = &This->IWMWriterAdvanced3_iface; + }else { + FIXME("Unsupported iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMWriter_AddRef(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMWriter_Release(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMWriter_SetProfileByID(IWMWriter *iface, REFGUID guidProfile) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%s)\n", This, debugstr_guid(guidProfile)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_SetProfile(IWMWriter *iface, IWMProfile *profile) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%p)\n", This, profile); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_SetOutputFilename(IWMWriter *iface, const WCHAR *filename) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(filename)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_GetInputCount(IWMWriter *iface, DWORD *pcInputs) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%p)\n", This, pcInputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_GetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps **input) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_SetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps *input) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_GetInputFormatCount(IWMWriter *iface, DWORD dwInputNumber, DWORD *pcFormat) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %p)\n", This, dwInputNumber, pcFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_GetInputFormat(IWMWriter *iface, DWORD dwInputNumber, DWORD dwFormatNumber, + IWMInputMediaProps **props) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %d %p)\n", This, dwInputNumber, dwFormatNumber, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_BeginWriting(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_EndWriting(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_AllocateSample(IWMWriter *iface, DWORD size, INSSBuffer **sample) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %p)\n", This, size, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_WriteSample(IWMWriter *iface, DWORD dwInputNum, QWORD cnsSampleTime, + DWORD flags, INSSBuffer *sample) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %s %x %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_Flush(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMWriterVtbl WMWriterVtbl = { + WMWriter_QueryInterface, + WMWriter_AddRef, + WMWriter_Release, + WMWriter_SetProfileByID, + WMWriter_SetProfile, + WMWriter_SetOutputFilename, + WMWriter_GetInputCount, + WMWriter_GetInputProps, + WMWriter_SetInputProps, + WMWriter_GetInputFormatCount, + WMWriter_GetInputFormat, + WMWriter_BeginWriting, + WMWriter_EndWriting, + WMWriter_AllocateSample, + WMWriter_WriteSample, + WMWriter_Flush +}; + +static inline WMWriter *impl_from_IWMWriterAdvanced3(IWMWriterAdvanced3 *iface) +{ + return CONTAINING_RECORD(iface, WMWriter, IWMWriterAdvanced3_iface); +} + +static HRESULT WINAPI WMWriterAdvanced_QueryInterface(IWMWriterAdvanced3 *iface, REFIID riid, void **ppv) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + return IWMWriter_QueryInterface(&This->IWMWriter_iface, riid, ppv); +} + +static ULONG WINAPI WMWriterAdvanced_AddRef(IWMWriterAdvanced3 *iface) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + return IWMWriter_AddRef(&This->IWMWriter_iface); +} + +static ULONG WINAPI WMWriterAdvanced_Release(IWMWriterAdvanced3 *iface) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + return IWMWriter_Release(&This->IWMWriter_iface); +} + +static HRESULT WINAPI WMWriterAdvanced_GetSinkCount(IWMWriterAdvanced3 *iface, DWORD *sinks) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, sinks); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetSink(IWMWriterAdvanced3 *iface, DWORD sink_num, IWMWriterSink **sink) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %p)\n", This, sink_num, sink); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_AddSink(IWMWriterAdvanced3 *iface, IWMWriterSink *sink) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, sink); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_RemoveSink(IWMWriterAdvanced3 *iface, IWMWriterSink *sink) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, sink); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_WriteStreamSample(IWMWriterAdvanced3 *iface, WORD stream_num, + QWORD sample_time, DWORD sample_send_time, QWORD sample_duration, DWORD flags, INSSBuffer *sample) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %s %u %s %x %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), + sample_send_time, wine_dbgstr_longlong(sample_duration), flags, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_SetLiveSource(IWMWriterAdvanced3 *iface, BOOL is_live_source) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%x)\n", This, is_live_source); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_IsRealTime(IWMWriterAdvanced3 *iface, BOOL *real_time) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, real_time); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetWriterTime(IWMWriterAdvanced3 *iface, QWORD *current_time) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, current_time); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetStatistics(IWMWriterAdvanced3 *iface, WORD stream_num, WM_WRITER_STATISTICS *stats) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %p)\n", This, stream_num, stats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_SetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD window) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u)\n", This, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced_GetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD *window) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%p)\n", This, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced2_GetInputSetting(IWMWriterAdvanced3 *iface, DWORD input_num, + const WCHAR *name, WMT_ATTR_DATATYPE *time, BYTE *value, WORD *length) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced2_SetInputSetting(IWMWriterAdvanced3 *iface, DWORD input_num, + const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced3_GetStatisticsEx(IWMWriterAdvanced3 *iface, WORD stream_num, + WM_WRITER_STATISTICS_EX *stats) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)->(%u %p)\n", This, stream_num, stats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriterAdvanced3_SetNonBlocking(IWMWriterAdvanced3 *iface) +{ + WMWriter *This = impl_from_IWMWriterAdvanced3(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMWriterAdvanced3Vtbl WMWriterAdvanced3Vtbl = { + WMWriterAdvanced_QueryInterface, + WMWriterAdvanced_AddRef, + WMWriterAdvanced_Release, + WMWriterAdvanced_GetSinkCount, + WMWriterAdvanced_GetSink, + WMWriterAdvanced_AddSink, + WMWriterAdvanced_RemoveSink, + WMWriterAdvanced_WriteStreamSample, + WMWriterAdvanced_SetLiveSource, + WMWriterAdvanced_IsRealTime, + WMWriterAdvanced_GetWriterTime, + WMWriterAdvanced_GetStatistics, + WMWriterAdvanced_SetSyncTolerance, + WMWriterAdvanced_GetSyncTolerance, + WMWriterAdvanced2_GetInputSetting, + WMWriterAdvanced2_SetInputSetting, + WMWriterAdvanced3_GetStatisticsEx, + WMWriterAdvanced3_SetNonBlocking +}; + +HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) +{ + WMWriter *ret; + + TRACE("(%p %p)\n", reserved, writer); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IWMWriter_iface.lpVtbl = &WMWriterVtbl; + ret->IWMWriterAdvanced3_iface.lpVtbl = &WMWriterAdvanced3Vtbl; + ret->ref = 1; + + *writer = &ret->IWMWriter_iface; + return S_OK; +} Propchange: trunk/reactos/dll/win32/wmvcore/writer.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Sun Oct 25 10:07:44 2015 @@ -216,6 +216,7 @@ reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.47 reactos/dll/win32/wmi # Synced to WineStaging-1.7.47 reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.47 +reactos/dll/win32/wmvcore # Synced to WineStaging-1.7.47 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.47 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.47 reactos/dll/win32/wuapi # Synced to WineStaging-1.7.47

9 years, 2 months

[akhaldi] 69684: [PSDK] Import wmsbuffer.idl and wmsdkidl.idl from Wine Staging 1.7.47. CORE-10400

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 25 10:00:30 2015 New Revision: 69684 URL: http://svn.reactos.org/svn/reactos?rev=69684&view=rev Log: [PSDK] Import wmsbuffer.idl and wmsdkidl.idl from Wine Staging 1.7.47. CORE-10400 Added: trunk/reactos/include/psdk/wmsbuffer.idl (with props) trunk/reactos/include/psdk/wmsdkidl.idl (with props) Modified: trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Sun Oct 25 10:00:30 2015 @@ -126,6 +126,8 @@ wincodecsdk.idl winsxs.idl wmiutils.idl + wmsbuffer.idl + wmsdkidl.idl wtypes.idl wuapi.idl xmldom.idl Added: trunk/reactos/include/psdk/wmsbuffer.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wmsbuffer.idl… ============================================================================== --- trunk/reactos/include/psdk/wmsbuffer.idl (added) +++ trunk/reactos/include/psdk/wmsbuffer.idl [iso-8859-1] Sun Oct 25 10:00:30 2015 @@ -0,0 +1,43 @@ +/* + * Copyright 2012 AndrÃ© Hentschel + * + * 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 "objidl.idl"; + +[ + object, + uuid(e1cd3524-03d7-11d2-9eed-006097d2d7cf), + pointer_default(unique), + local +] +interface INSSBuffer : IUnknown +{ + HRESULT GetLength( + [out] DWORD *pdwLength); + HRESULT SetLength( + [in] DWORD dwLength); + + HRESULT GetMaxLength( + [out] DWORD *pdwLength); + + HRESULT GetBuffer( + [out] BYTE **ppdwBuffer); + + HRESULT GetBufferAndLength( + [out] BYTE **ppdwBuffer, + [out] DWORD *pdwLength); +}; Propchange: trunk/reactos/include/psdk/wmsbuffer.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/wmsdkidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wmsdkidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/wmsdkidl.idl (added) +++ trunk/reactos/include/psdk/wmsdkidl.idl [iso-8859-1] Sun Oct 25 10:00:30 2015 @@ -0,0 +1,1059 @@ +/* + * Copyright 2012 AndrÃ© Hentschel + * + * 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 "wmsbuffer.idl"; +/* import "drmexternals.idl"; */ + +typedef unsigned __int64 QWORD; + +typedef struct _WMMediaType +{ + GUID majortype; + GUID subtype; + BOOL bFixedSizeSamples; + BOOL bTemporalCompression; + ULONG lSampleSize; + GUID formattype; + IUnknown *pUnk; + ULONG cbFormat; + [size_is(cbFormat)] BYTE *pbFormat; +} WM_MEDIA_TYPE; + +typedef struct _WMWriterStatistics +{ + QWORD qwSampleCount; + QWORD qwByteCount; + QWORD qwDroppedSampleCount; + QWORD qwDroppedByteCount; + DWORD dwCurrentBitrate; + DWORD dwAverageBitrate; + DWORD dwExpectedBitrate; + DWORD dwCurrentSampleRate; + DWORD dwAverageSampleRate; + DWORD dwExpectedSampleRate; +} WM_WRITER_STATISTICS; + +typedef struct _WMWriterStatisticsEx +{ + DWORD dwBitratePlusOverhead; + DWORD dwCurrentSampleDropRateInQueue; + DWORD dwCurrentSampleDropRateInCodec; + DWORD dwCurrentSampleDropRateInMultiplexer; + DWORD dwTotalSampleDropsInQueue; + DWORD dwTotalSampleDropsInCodec; + DWORD dwTotalSampleDropsInMultiplexer; +} WM_WRITER_STATISTICS_EX; + +typedef struct _WMReaderStatistics +{ + DWORD cbSize; + DWORD dwBandwidth; + DWORD cPacketsReceived; + DWORD cPacketsRecovered; + DWORD cPacketsLost; + WORD wQuality; +} WM_READER_STATISTICS; + +typedef struct _WMReaderClientInfo +{ + DWORD cbSize; + WCHAR *wszLang; + WCHAR *wszBrowserUserAgent; + WCHAR *wszBrowserWebPage; + QWORD qwReserved; + LPARAM *pReserved; + WCHAR *wszHostExe; + QWORD qwHostVersion; + WCHAR *wszPlayerUserAgent; +} WM_READER_CLIENTINFO; + +typedef enum WMT_ATTR_DATATYPE +{ + WMT_TYPE_DWORD = 0, + WMT_TYPE_STRING = 1, + WMT_TYPE_BINARY = 2, + WMT_TYPE_BOOL = 3, + WMT_TYPE_QWORD = 4, + WMT_TYPE_WORD = 5, + WMT_TYPE_GUID = 6, +} WMT_ATTR_DATATYPE; + +typedef enum WMT_STATUS +{ + WMT_ERROR = 0, + WMT_OPENED = 1, + WMT_BUFFERING_START = 2, + WMT_BUFFERING_STOP = 3, + WMT_EOF = 4, + WMT_END_OF_FILE = 4, + WMT_END_OF_SEGMENT = 5, + WMT_END_OF_STREAMING = 6, + WMT_LOCATING = 7, + WMT_CONNECTING = 8, + WMT_NO_RIGHTS = 9, + WMT_MISSING_CODEC = 10, + WMT_STARTED = 11, + WMT_STOPPED = 12, + WMT_CLOSED = 13, + WMT_STRIDING = 14, + WMT_TIMER = 15, + WMT_INDEX_PROGRESS = 16, + WMT_SAVEAS_START = 17, + WMT_SAVEAS_STOP = 18, + WMT_NEW_SOURCEFLAGS = 19, + WMT_NEW_METADATA = 20, + WMT_BACKUPRESTORE_BEGIN = 21, + WMT_SOURCE_SWITCH = 22, + WMT_ACQUIRE_LICENSE = 23, + WMT_INDIVIDUALIZE = 24, + WMT_NEEDS_INDIVIDUALIZATION = 25, + WMT_NO_RIGHTS_EX = 26, + WMT_BACKUPRESTORE_END = 27, + WMT_BACKUPRESTORE_CONNECTING = 28, + WMT_BACKUPRESTORE_DISCONNECTING = 29, + WMT_ERROR_WITHURL = 30, + WMT_RESTRICTED_LICENSE = 31, + WMT_CLIENT_CONNECT = 32, + WMT_CLIENT_DISCONNECT = 33, + WMT_NATIVE_OUTPUT_PROPS_CHANGED = 34, + WMT_RECONNECT_START = 35, + WMT_RECONNECT_END = 36, + WMT_CLIENT_CONNECT_EX = 37, + WMT_CLIENT_DISCONNECT_EX = 38, + WMT_SET_FEC_SPAN = 39, + WMT_PREROLL_READY = 40, + WMT_PREROLL_COMPLETE = 41, + WMT_CLIENT_PROPERTIES = 42, + WMT_LICENSEURL_SIGNATURE_STATE = 43, + WMT_INIT_PLAYLIST_BURN = 44, + WMT_TRANSCRYPTOR_INIT = 45, + WMT_TRANSCRYPTOR_SEEKED = 46, + WMT_TRANSCRYPTOR_READ = 47, + WMT_TRANSCRYPTOR_CLOSED = 48, + WMT_PROXIMITY_RESULT = 49, + WMT_PROXIMITY_COMPLETED = 50, + WMT_CONTENT_ENABLER = 51 +} WMT_STATUS; + +typedef enum WMT_STREAM_SELECTION +{ + WMT_OFF = 0, + WMT_CLEANPOINT_ONLY = 1, + WMT_ON = 2, +} WMT_STREAM_SELECTION; + +typedef enum WMT_VERSION +{ + WMT_VER_4_0 = 0x00040000, + WMT_VER_7_0 = 0x00070000, + WMT_VER_8_0 = 0x00080000, + WMT_VER_9_0 = 0x00090000 +} WMT_VERSION; + +typedef enum WMT_PLAY_MODE +{ + WMT_PLAY_MODE_AUTOSELECT, + WMT_PLAY_MODE_LOCAL, + WMT_PLAY_MODE_DOWNLOAD, + WMT_PLAY_MODE_STREAMING +} WMT_PLAY_MODE; + +typedef enum tagWMT_OFFSET_FORMAT +{ + WMT_OFFSET_FORMAT_100NS, + WMT_OFFSET_FORMAT_FRAME_NUMBERS, + WMT_OFFSET_FORMAT_PLAYLIST_OFFSET, + WMT_OFFSET_FORMAT_TIMECODE, + WMT_OFFSET_FORMAT_100NS_APPROXIMATE +} WMT_OFFSET_FORMAT; + +typedef LPCWSTR LPCWSTR_WMSDK_TYPE_SAFE; + +[ + object, + uuid(6d7cdc70-9888-11d3-8edc-00c04f6109cf), + pointer_default(unique), + local +] +interface IWMStatusCallback : IUnknown +{ + HRESULT OnStatus( + [in] WMT_STATUS Status, + [in] HRESULT hr, + [in] WMT_ATTR_DATATYPE dwType, + [in] BYTE *pValue, + [in] void *pvContext); +}; + +[ + object, + uuid(96406bd8-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMReaderCallback : IWMStatusCallback +{ + HRESULT OnSample( + [in] DWORD dwOutputNum, + [in] QWORD cnsSampleTime, + [in] QWORD cnsSampleDuration, + [in] DWORD dwFlags, + [in] INSSBuffer *pSample, + [in] void *pvContext); +}; + +[ + object, + uuid(96406Bdd-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMStreamList : IUnknown +{ + HRESULT GetStreams( + [out, size_is(*pcStreams)] WORD *pwStreamNumArray, + [in, out] WORD *pcStreams); + + HRESULT AddStream([in] WORD wStreamNum); + HRESULT RemoveStream([in] WORD wStreamNum); +} + +[ + object, + uuid(96406Bde-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMMutualExclusion : IWMStreamList +{ + HRESULT GetType([out] GUID *pguidType); + HRESULT SetType([in] REFGUID guidType); +} + +[ + object, + uuid(96406Bdc-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMStreamConfig : IUnknown +{ + HRESULT GetStreamType([out] GUID *pguidStreamType); + HRESULT GetStreamNumber([out] WORD *pwStreamNum); + HRESULT SetStreamNumber([in] WORD wStreamNum); + + HRESULT GetStreamName( + [out, size_is(*pcchStreamName)] WCHAR *pwszStreamName, + [in, out] WORD *pcchStreamName); + + HRESULT SetStreamName([in] LPCWSTR_WMSDK_TYPE_SAFE pwszStreamName); + + HRESULT GetConnectionName( + [out, size_is(*pcchInputName)] WCHAR *pwszInputName, + [in, out] WORD *pcchInputName); + + HRESULT SetConnectionName([in] LPCWSTR_WMSDK_TYPE_SAFE pwszInputName); + HRESULT GetBitrate([out] DWORD *pdwBitrate); + HRESULT SetBitrate([in] DWORD pdwBitrate); + HRESULT GetBufferWindow([out] DWORD *pmsBufferWindow); + HRESULT SetBufferWindow([in] DWORD msBufferWindow); +} + +[ + object, + uuid(96406bdb-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMProfile : IUnknown +{ + HRESULT GetVersion( + [out] WMT_VERSION *pdwVersion); + + HRESULT GetName( + [out, size_is(*pcchName)] WCHAR *pwszName, + [in, out] DWORD *pcchName); + + HRESULT SetName( + [in] const WCHAR *pwszName); + + HRESULT GetDescription( + [out, size_is(*pcchDescription)] WCHAR *pwszDescription, + [in, out] DWORD *pcchDescription); + + HRESULT SetDescription( + [in] const WCHAR *pwszDescription); + + HRESULT GetStreamCount( + [out] DWORD *pcStreams); + + HRESULT GetStream( + [in] DWORD dwStreamIndex, + [out] IWMStreamConfig **ppConfig); + + HRESULT GetStreamByNumber( + [in] WORD wStreamNum, + [out] IWMStreamConfig **ppConfig); + + HRESULT RemoveStream( + [in] IWMStreamConfig *pConfig); + + HRESULT RemoveStreamByNumber( + [in] WORD wStreamNum); + + HRESULT AddStream( + [in] IWMStreamConfig *pConfig); + + HRESULT ReconfigStream( + [in] IWMStreamConfig *pConfig); + + HRESULT CreateNewStream( + [in] REFGUID guidStreamType, + [out] IWMStreamConfig **ppConfig); + + HRESULT GetMutualExclusionCount( + [out] DWORD *pcME); + + HRESULT GetMutualExclusion( + [in] DWORD dwMEIndex, + [out] IWMMutualExclusion **ppME); + + HRESULT RemoveMutualExclusion( + [in] IWMMutualExclusion *pME); + + HRESULT AddMutualExclusion( + [in] IWMMutualExclusion *pME); + + HRESULT CreateNewMutualExclusion( + [out] IWMMutualExclusion **ppME); +} + +[ + object, + uuid(d16679f2-6ca0-472d-8d31-2f5d55aee155), + pointer_default(unique), + local +] +interface IWMProfileManager : IUnknown +{ + HRESULT CreateEmptyProfile( + [in] WMT_VERSION dwVersion, + [out] IWMProfile **ppProfile); + + HRESULT LoadProfileByID( + [in] REFGUID guidProfile, + [out] IWMProfile **ppProfile); + + HRESULT LoadProfileByData( + [in] const WCHAR *pwszProfile, + [out] IWMProfile **ppProfile); + + HRESULT SaveProfile( + [in] IWMProfile *pIWMProfile, + [in] WCHAR *pwszProfile, + [in, out] DWORD *pdwLength); + + HRESULT GetSystemProfileCount( + [out] DWORD *pcProfiles); + + HRESULT LoadSystemProfile( + [in] DWORD dwProfileIndex, + [out] IWMProfile **ppProfile); +} + +cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") + +[ + object, + uuid(96406bce-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMMediaProps : IUnknown +{ + HRESULT GetType( + [out] GUID *pguidType); + + HRESULT GetMediaType( + [out] WM_MEDIA_TYPE *pType, + [in, out] DWORD *pcbType); + + HRESULT SetMediaType( + [in] WM_MEDIA_TYPE *pType); +}; + +[ + object, + uuid(96406bd7-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMOutputMediaProps : IWMMediaProps +{ + HRESULT GetStreamGroupName( + [out, size_is(*pcchName)] WCHAR *pwszName, + [in, out] WORD *pcchName); + + HRESULT GetConnectionName( + [out, size_is(*pcchName)] WCHAR *pwszName, + [in, out] WORD *pcchName); +}; + +[ + object, + uuid(96406bd9-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMMetadataEditor : IUnknown +{ + HRESULT Open( + [in] const WCHAR *pwszFilename); + + HRESULT Close(); + + HRESULT Flush(); +}; + +[ + object, + uuid(96406bd6-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMReader : IUnknown +{ + HRESULT Open( + [in] const WCHAR *pwszURL, + [in] IWMReaderCallback *pCallback, + [in] void *pvContext); + + HRESULT Close(); + + HRESULT GetOutputCount( + [out] DWORD *pcOutputs); + + HRESULT GetOutputProps( + [in] DWORD dwOutputNum, + [out] IWMOutputMediaProps **ppOutput); + + HRESULT SetOutputProps( + [in] DWORD dwOutputNum, + [in] IWMOutputMediaProps *pOutput); + + HRESULT GetOutputFormatCount( + [in] DWORD dwOutputNumber, + [out] DWORD *pcFormats); + + HRESULT GetOutputFormat( + [in] DWORD dwOutputNumber, + [in] DWORD dwFormatNumber, + [out] IWMOutputMediaProps** ppProps); + + HRESULT Start( + [in] QWORD cnsStart, + [in] QWORD cnsDuration, + [in] float fRate, + [in] void *pvContext); + + HRESULT Stop(); + + HRESULT Pause(); + + HRESULT Resume(); +}; + +[ + object, + uuid(e5b7ca9a-0f1c-4f66-9002-74ec50d8b304), + pointer_default(unique), + local +] +interface IWMPlayerHook : IUnknown +{ + HRESULT PreDecode(); +} + +[ + object, + uuid(96406bea-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMReaderAdvanced : IUnknown +{ + HRESULT SetUserProvidedClock( + [in] BOOL fUserClock); + + HRESULT GetUserProvidedClock( + [out] BOOL *pfUserClock); + + HRESULT DeliverTime( + [in] QWORD cnsTime); + + HRESULT SetManualStreamSelection( + [in] BOOL fSelection); + + HRESULT GetManualStreamSelection( + [out] BOOL *pfSelection); + + HRESULT SetStreamsSelected( + [in] WORD cStreamCount, + [in] WORD *pwStreamNumbers, + [in] WMT_STREAM_SELECTION *pSelections); + + HRESULT GetStreamSelected( + [in] WORD wStreamNum, + [out] WMT_STREAM_SELECTION *pSelection); + + HRESULT SetReceiveSelectionCallbacks( + [in] BOOL fGetCallbacks); + + HRESULT GetReceiveSelectionCallbacks( + [out] BOOL *pfGetCallbacks); + + HRESULT SetReceiveStreamSamples( + [in] WORD wStreamNum, + [in] BOOL fReceiveStreamSamples); + + HRESULT GetReceiveStreamSamples( + [in] WORD wStreamNum, + [out] BOOL *pfReceiveStreamSamples); + + HRESULT SetAllocateForOutput( + [in] DWORD dwOutputNum, + [in] BOOL fAllocate); + + HRESULT GetAllocateForOutput( + [in] DWORD dwOutputNum, + [out] BOOL *pfAllocate); + + HRESULT SetAllocateForStream( + [in] WORD wStreamNum, + [in] BOOL fAllocate); + + HRESULT GetAllocateForStream( + [in] WORD dwSreamNum, + [out] BOOL *pfAllocate); + + HRESULT GetStatistics( + [in, out] WM_READER_STATISTICS *pStatistics); + + HRESULT SetClientInfo( + [in] WM_READER_CLIENTINFO *pClientInfo); + + HRESULT GetMaxOutputSampleSize( + [in] DWORD dwOutput, + [out] DWORD *pcbMax); + + HRESULT GetMaxStreamSampleSize( + [in] WORD wStream, + [out] DWORD *pcbMax); + + HRESULT NotifyLateDelivery( + QWORD cnsLateness); +} + +[ + object, + uuid(ae14a945-b90c-4d0d-9127-80d665f7d73e), + pointer_default(unique), + local +] +interface IWMReaderAdvanced2 : IWMReaderAdvanced +{ + HRESULT SetPlayMode( + [in] WMT_PLAY_MODE Mode); + + HRESULT GetPlayMode( + [out] WMT_PLAY_MODE *pMode); + + HRESULT GetBufferProgress( + [out] DWORD *pdwPercent, + [out] QWORD *pcnsBuffering); + + HRESULT GetDownloadProgress( + [out] DWORD *pdwPercent, + [out] QWORD *pqwBytesDownloaded, + [out] QWORD *pcnsDownload); + + HRESULT GetSaveAsProgress( + [out] DWORD *pdwPercent); + + HRESULT SaveFileAs( + [in] const WCHAR *pwszFilename); + + HRESULT GetProtocolName( + [out, size_is(*pcchProtocol)] WCHAR *pwszProtocol, + [in, out] DWORD *pcchProtocol); + + HRESULT StartAtMarker( + [in] WORD wMarkerIndex, + [in] QWORD cnsDuration, + [in] float fRate, + [in] void *pvContext); + + HRESULT GetOutputSetting( + [in] DWORD dwOutputNum, + [in] LPCWSTR pszName, + [out] WMT_ATTR_DATATYPE *pType, + [out, size_is(*pcbLength)] BYTE *pValue, + [in, out] WORD *pcbLength); + + HRESULT SetOutputSetting( + [in] DWORD dwOutputNum, + [in] LPCWSTR pszName, + [in] WMT_ATTR_DATATYPE Type, + [in, size_is(cbLength)] const BYTE *pValue, + [in] WORD cbLength); + + HRESULT Preroll( + [in] QWORD cnsStart, + [in] QWORD cnsDuration, + [in] float fRate); + + HRESULT SetLogClientID( + [in] BOOL fLogClientID); + + HRESULT GetLogClientID( + [out] BOOL *pfLogClientID); + + HRESULT StopBuffering(); + + HRESULT OpenStream( + [in] IStream *pStream, + [in] IWMReaderCallback *pCallback, + [in] void *pvContext); +} + +[ + object, + uuid(5dc0674b-f04B-4a4e-9f2a-b1afde2c8100), + pointer_default(unique), + local +] +interface IWMReaderAdvanced3 : IWMReaderAdvanced2 +{ + HRESULT StopNetStreaming(); + + HRESULT StartAtPosition( + [in] WORD wStreamNum, + [in] void *pvOffsetStart, + [in] void *pvDuration, + [in] WMT_OFFSET_FORMAT dwOffsetFormat, + [in] float fRate, + [in] void *pvContext); +} + +[ + object, + uuid(945a76a2-12ae-4d48-bd3c-cd1d90399b85), + pointer_default(unique), + local +] +interface IWMReaderAdvanced4 : IWMReaderAdvanced3 +{ + HRESULT GetLanguageCount( + [in] DWORD dwOutputNum, + [out] WORD *pwLanguageCount); + + HRESULT GetLanguage( + [in] DWORD dwOutputNum, + [in] WORD wLanguage, + [out, size_is(*pcchLanguageStringLength)] WCHAR *pwszLanguageString, + [in, out] WORD *pcchLanguageStringLength); + + HRESULT GetMaxSpeedFactor( + [out] double *pdblFactor); + + HRESULT IsUsingFastCache( + [out] BOOL *pfUsingFastCache); + + HRESULT AddLogParam( + [in] LPCWSTR wszNameSpace, + [in] LPCWSTR wszName, + [in] LPCWSTR wszValue); + + HRESULT SendLogParams(); + + HRESULT CanSaveFileAs( + [out] BOOL *pfCanSave); + + HRESULT CancelSaveFileAs(); + + HRESULT GetURL( + [out, size_is(*pcchURL)] WCHAR *pwszURL, + [in, out] DWORD *pcchURL); +} + +[ + object, + uuid(24c44db0-55d1-49ae-a5cc-f13815e36363), + pointer_default(unique), + local +] +interface IWMReaderAdvanced5 : IWMReaderAdvanced4 +{ + HRESULT SetPlayerHook( + [in] DWORD dwOutputNum, + [in] IWMPlayerHook *pHook); +} + +[ + object, + uuid(18a2e7f8-428f-4acd-8a00-e64639bc93de), + pointer_default(unique), + local +] +interface IWMReaderAdvanced6 : IWMReaderAdvanced5 +{ + HRESULT SetProtectStreamSamples( + [in, size_is(cbCertificate)] BYTE *pbCertificate, + [in] DWORD cbCertificate, + [in] DWORD dwCertificateType, + [in] DWORD dwFlags, + [out, size_is(*pcbInitializationVector)] BYTE *pbInitializationVector, + [in, out] DWORD *pcbInitializationVector); +} + +[ + object, + uuid(9397f121-7705-4dc9-b049-98b698188414), + pointer_default( unique ), + local +] +interface IWMSyncReader : IUnknown +{ + HRESULT Open( + [in] const WCHAR *pwszFilename); + + HRESULT Close(); + + HRESULT SetRange( + [in] QWORD cnsStartTime, + [in] LONGLONG cnsDuration); + + HRESULT SetRangeByFrame( + [in] WORD wStreamNum, + [in] QWORD qwFrameNumber, + [in] LONGLONG cFramesToRead); + + HRESULT GetNextSample( + [in] WORD wStreamNum, + [out] INSSBuffer **ppSample, + [out] QWORD *pcnsSampleTime, + [out] QWORD *pcnsDuration, + [out] DWORD *pdwFlags, + [out] DWORD *pdwOutputNum, + [out] WORD *pwStreamNum); + + HRESULT SetStreamsSelected( + [in] WORD cStreamCount, + [in] WORD *pwStreamNumbers, + [in] WMT_STREAM_SELECTION *pSelections); + + HRESULT GetStreamSelected( + [in] WORD wStreamNum, + [out] WMT_STREAM_SELECTION *pSelection); + + HRESULT SetReadStreamSamples( + [in] WORD wStreamNum, + [in] BOOL fCompressed); + + HRESULT GetReadStreamSamples( + [in] WORD wStreamNum, + [out] BOOL *pfCompressed); + + HRESULT GetOutputSetting( + [in] DWORD dwOutputNum, + [in] LPCWSTR pszName, + [out] WMT_ATTR_DATATYPE *pType, + [out, size_is(*pcbLength)] BYTE *pValue, + [in, out] WORD *pcbLength); + + HRESULT SetOutputSetting( + [in] DWORD dwOutputNum, + [in] LPCWSTR pszName, + [in] WMT_ATTR_DATATYPE Type, + [in, size_is(cbLength)] const BYTE *pValue, + [in] WORD cbLength); + + HRESULT GetOutputCount( + [out] DWORD *pcOutputs); + + HRESULT GetOutputProps( + [in] DWORD dwOutputNum, + [out] IWMOutputMediaProps **ppOutput); + + HRESULT SetOutputProps( + [in] DWORD dwOutputNum, + [in] IWMOutputMediaProps *pOutput); + + HRESULT GetOutputFormatCount( + [in] DWORD dwOutputNum, + [out] DWORD *pcFormats); + + HRESULT GetOutputFormat( + [in] DWORD dwOutputNum, + [in] DWORD dwFormatNum, + [out] IWMOutputMediaProps **ppProps); + + HRESULT GetOutputNumberForStream( + [in] WORD wStreamNum, + [out] DWORD *pdwOutputNum); + + HRESULT GetStreamNumberForOutput( + [in] DWORD dwOutputNum, + [out] WORD *pwStreamNum); + + HRESULT GetMaxOutputSampleSize( + [in] DWORD dwOutput, + [out] DWORD *pcbMax); + + HRESULT GetMaxStreamSampleSize( + [in] WORD wStream, + [out] DWORD *pcbMax); + + HRESULT OpenStream( + [in] IStream *pStream); +}; + +[ + object, + uuid(96406bd5-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMInputMediaProps : IWMMediaProps +{ + HRESULT GetConnectionName( + [out, size_is(*pcchName)] WCHAR *pwszName, + [in, out] WORD *pcchName); + + HRESULT GetGroupName( + [out, size_is(*pcchName)] WCHAR *pwszName, + [in, out] WORD *pcchName); +} + +[ + object, + uuid(96406be4-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMWriterSink : IUnknown +{ + HRESULT OnHeader( + [in] INSSBuffer *pHeader); + + HRESULT IsRealTime( + [out] BOOL *pfRealTime); + + HRESULT AllocateDataUnit( + [in] DWORD cbDataUnit, + [out] INSSBuffer **ppDataUnit); + + HRESULT OnDataUnit( + [in] INSSBuffer *pDataUnit); + + HRESULT OnEndWriting(); +} + +[ + object, + uuid(96406bd4-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMWriter : IUnknown +{ + HRESULT SetProfileByID( + [in] REFGUID guidProfile); + + HRESULT SetProfile( + [in] IWMProfile *pProfile); + + HRESULT SetOutputFilename( + [in] const WCHAR *pwszFilename); + + HRESULT GetInputCount( + [out] DWORD *pcInputs); + + HRESULT GetInputProps( + [in] DWORD dwInputNum, + [out] IWMInputMediaProps **ppInput); + + HRESULT SetInputProps( + [in] DWORD dwInputNum, + [in] IWMInputMediaProps *pInput); + + HRESULT GetInputFormatCount( + [in] DWORD dwInputNumber, + [out] DWORD *pcFormats); + + HRESULT GetInputFormat( + [in] DWORD dwInputNumber, + [in] DWORD dwFormatNumber, + [out] IWMInputMediaProps **pProps); + + HRESULT BeginWriting(); + + HRESULT EndWriting(); + + HRESULT AllocateSample( + [in] DWORD dwSampleSize, + [out] INSSBuffer **ppSample); + + HRESULT WriteSample( + [in] DWORD dwInputNum, + [in] QWORD cnsSampleTime, + [in] DWORD dwFlags, + [in] INSSBuffer *pSample); + + HRESULT Flush(); +} + +[ + object, + uuid(96406be3-2b2b-11d3-b36b-00C04f6108ff), + pointer_default(unique), + local +] +interface IWMWriterAdvanced : IUnknown +{ + HRESULT GetSinkCount( + [out] DWORD *pcSinks); + + HRESULT GetSink( + [in] DWORD dwSinkNum, + [out] IWMWriterSink **ppSink); + + HRESULT AddSink( + [in] IWMWriterSink *pSink); + + HRESULT RemoveSink( + [in] IWMWriterSink *pSink); + + HRESULT WriteStreamSample( + [in] WORD wStreamNum, + [in] QWORD cnsSampleTime, + [in] DWORD msSampleSendTime, + [in] QWORD cnsSampleDuration, + [in] DWORD dwFlags, + [in] INSSBuffer *pSample); + + HRESULT SetLiveSource( + BOOL fIsLiveSource); + + HRESULT IsRealTime( + [out] BOOL *pfRealTime); + + HRESULT GetWriterTime( + [out] QWORD *pCurrentTime); + + HRESULT GetStatistics( + [in] WORD wStreamNum, + [out] WM_WRITER_STATISTICS *pStats); + + HRESULT SetSyncTolerance( + [in] DWORD msWindow); + + HRESULT GetSyncTolerance( + [out] DWORD *pmsWindow); +} + +[ + object, + uuid(962dc1ec-c046-4db8-9cc7-26ceae500817), + pointer_default(unique), + local +] +interface IWMWriterAdvanced2 : IWMWriterAdvanced +{ + HRESULT GetInputSetting( + [in] DWORD dwInputNum, + [in] LPCWSTR pszName, + [out] WMT_ATTR_DATATYPE *pType, + [out, size_is(*pcbLength)] BYTE *pValue, + [in, out] WORD *pcbLength); + + HRESULT SetInputSetting( + [in] DWORD dwInputNum, + [in] LPCWSTR pszName, + [in] WMT_ATTR_DATATYPE Type, + [in, size_is(cbLength)] const BYTE *pValue, + [in] WORD cbLength); +} + +[ + object, + uuid(2cd6492d-7c37-4e76-9d3b-59261183a22e), + pointer_default(unique), + local +] +interface IWMWriterAdvanced3 : IWMWriterAdvanced2 +{ + HRESULT GetStatisticsEx( + [in] WORD wStreamNum, + [out] WM_WRITER_STATISTICS_EX *pStats); + + HRESULT SetNonBlocking(); +} + +cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") +cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") + +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB1, 0xe436eb78,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB4, 0xe436eb79,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB8, 0xe436eb7a,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB565, 0xe436eb7b,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB555, 0xe436eb7c,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB24, 0xe436eb7d,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB32, 0xe436eb7e,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_I420, 0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_IYUV, 0x56555949,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YV12, 0x32315659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YUY2, 0x32595559,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_P422, 0x32323450,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_UYVY, 0x59565955,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YVYU, 0x55595659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YVU9, 0x39555659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_VIDEOIMAGE, 0x1d4a45f2,0xe5f6,0x4b44,0x83,0x88,0xf0,0xae,0x5c,0x0e,0x0c,0x37);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MP43, 0x3334504d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MP4S, 0x5334504d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_M4S2, 0x3253344d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMV1, 0x31564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMV2, 0x32564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MSS1, 0x3153534d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MPEG2_VIDEO, 0xe06d8026,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea);") +cpp_quote("EXTERN_GUID(WMMEDIATYPE_Audio, 0x73647561,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_PCM, 0x00000001,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_DRM, 0x00000009,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV9, 0x00000162,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMAudio_Lossless, 0x00000163,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MSS2, 0x3253534d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMSP1, 0x0000000a,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMSP2, 0x0000000b,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMV3, 0x33564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMVP, 0x50564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WVP2, 0x32505657,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMVA, 0x41564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WVC1, 0x31435657,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") Propchange: trunk/reactos/include/psdk/wmsdkidl.idl ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 2 months

[pschweitzer] 69683: [CRT] Fix NTDLL implementation of mbstowcs() and wcstombs() so that they return length in caracters and not in bytes. This fixes last failing *to* CRT apitests CORE-10390

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Oct 25 09:28:57 2015 New Revision: 69683 URL: http://svn.reactos.org/svn/reactos?rev=69683&view=rev Log: [CRT] Fix NTDLL implementation of mbstowcs() and wcstombs() so that they return length in caracters and not in bytes. This fixes last failing *to* CRT apitests CORE-10390 Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c trunk/reactos/lib/sdk/crt/string/wcstombs_nt.c Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] Sun Oct 25 09:28:57 2015 @@ -49,7 +49,7 @@ mbstr, Length); - return (size_t)Size; + return (size_t)(Size / sizeof(wchar_t)); } Status = RtlMultiByteToUnicodeN (wcstr, @@ -60,7 +60,7 @@ if (!NT_SUCCESS(Status)) return -1; - return (size_t)Size; + return (size_t)(Size / sizeof(wchar_t));; } /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcstombs_nt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstomb… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstombs_nt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstombs_nt.c [iso-8859-1] Sun Oct 25 09:28:57 2015 @@ -40,7 +40,7 @@ (wchar_t*)((size_t)wcstr), Length * sizeof(WCHAR)); - return (size_t)Size; + return (size_t)(Size / sizeof(char)); } Status = RtlUnicodeToMultiByteN (mbstr, @@ -51,7 +51,7 @@ if (!NT_SUCCESS(Status)) return -1; - return (size_t)Size; + return (size_t)(Size / sizeof(char)); } /* EOF */

9 years, 2 months

[pschweitzer] 69682: [CRT] Import _mbstowcs_l() from Wine and call it in mbstowcs(). This fixes crashes when calling the msvcrt, crtdll implementation of mbstowcs() with no output string. Thus, it ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Oct 25 08:36:14 2015 New Revision: 69682 URL: http://svn.reactos.org/svn/reactos?rev=69682&view=rev Log: [CRT] Import _mbstowcs_l() from Wine and call it in mbstowcs(). This fixes crashes when calling the msvcrt, crtdll implementation of mbstowcs() with no output string. Thus, it fixes a few crashing apitests The NTDLL version is still broken in some way, need to investigate why. CORE-10390 #resolve #comment Fixed with 69682. Thanks for the report! Modified: trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c Modified: trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c [iso-8859-1] Sun Oct 25 08:36:14 2015 @@ -1,28 +1,43 @@ #include <precomp.h> +/********************************************************************* + * _mbstowcs_l + */ +size_t CDECL _mbstowcs_l(wchar_t *wcstr, const char *mbstr, + size_t count, _locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + size_t i, size; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = ((MSVCRT__locale_t)locale)->locinfo; + + /* Ignore count parameter */ + if(!wcstr) + return MultiByteToWideChar(locinfo->lc_codepage, 0, mbstr, -1, NULL, 0)-1; + + for(i=0, size=0; i<count; i++) { + if(mbstr[size] == '\0') + break; + + size += (_isleadbyte_l((unsigned char)mbstr[size], locale) ? 2 : 1); + } + + size = MultiByteToWideChar(locinfo->lc_codepage, 0, + mbstr, size, wcstr, count); + + if(size<count && wcstr) + wcstr[size] = '\0'; + + return size; +} /* * @implemented */ size_t mbstowcs (wchar_t *widechar, const char *multibyte, size_t number) { - int bytes; - size_t n = 0; - - while (n < number) { - - if ((bytes = mbtowc (widechar, multibyte, MB_LEN_MAX)) < 0) - return (size_t) -1; - - if (bytes == 0) { - *widechar = (wchar_t) '\0'; - return n; - } - - widechar++; - multibyte += bytes; - n++; - } - - return n; + return _mbstowcs_l(widechar, multibyte, number, NULL); }

9 years, 2 months

[pschweitzer] 69681: [CRT_APITEST] Add more tests CORE-10390

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Oct 25 07:42:34 2015 New Revision: 69681 URL: http://svn.reactos.org/svn/reactos?rev=69681&view=rev Log: [CRT_APITEST] Add more tests CORE-10390 Modified: trunk/rostests/apitests/crt/mbstowcs.c trunk/rostests/apitests/crt/wcstombs.c Modified: trunk/rostests/apitests/crt/mbstowcs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/mbstowcs.c?r… ============================================================================== --- trunk/rostests/apitests/crt/mbstowcs.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/mbstowcs.c [iso-8859-1] Sun Oct 25 07:42:34 2015 @@ -12,14 +12,26 @@ #include <specstrings.h> #define StrROS "ReactOS" - +#define LStrROS L"ReactOS" START_TEST(mbstowcs) { size_t len; + wchar_t out[ARRAYSIZE(LStrROS)]; - len = mbstowcs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0])); + len = mbstowcs(NULL, StrROS, 0); ok(len == 7, "Got len = %u, excepting 7\n", len); - len = mbstowcs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0]) - 1); + len = mbstowcs(NULL, StrROS, 0); ok(len == 7, "Got len = %u, excepting 7\n", len); + len = mbstowcs(NULL, StrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = mbstowcs(NULL, StrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = mbstowcs(out, StrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + ok_wstr(out, LStrROS); + memset(out, 0, sizeof(out)); + len = mbstowcs(out, StrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + ok_wstr(out, LStrROS); } Modified: trunk/rostests/apitests/crt/wcstombs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstombs.c?r… ============================================================================== --- trunk/rostests/apitests/crt/wcstombs.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/wcstombs.c [iso-8859-1] Sun Oct 25 07:42:34 2015 @@ -11,15 +11,27 @@ #include <stdlib.h> #include <specstrings.h> -#define StrROS L"ReactOS" - +#define LStrROS L"ReactOS" +#define StrROS "ReactOS" START_TEST(wcstombs) { size_t len; + char out[ARRAYSIZE(StrROS)]; - len = wcstombs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0])); + len = wcstombs(NULL, LStrROS, 0); ok(len == 7, "Got len = %u, excepting 7\n", len); - len = wcstombs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0]) - 1); + len = wcstombs(NULL, LStrROS, 0); ok(len == 7, "Got len = %u, excepting 7\n", len); + len = wcstombs(NULL, LStrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = wcstombs(NULL, LStrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = wcstombs(out, LStrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + ok_str(out, StrROS); + memset(out, 0, sizeof(out)); + len = wcstombs(out, LStrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + ok_str(out, StrROS); }

9 years, 2 months

[pschweitzer] 69680: [CRT_APITEST] Add a few tests to show mbstowcs/wcstombs behavior will NULL ptr. CORE-10390

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Oct 24 23:18:33 2015 New Revision: 69680 URL: http://svn.reactos.org/svn/reactos?rev=69680&view=rev Log: [CRT_APITEST] Add a few tests to show mbstowcs/wcstombs behavior will NULL ptr. CORE-10390 Added: trunk/rostests/apitests/crt/mbstowcs.c (with props) trunk/rostests/apitests/crt/wcstombs.c (with props) Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -425,7 +425,7 @@ # longjmp.c # malloc.c # mblen.c -# mbstowcs.c + mbstowcs.c # mbtowc.c # memchr.c # memcmp.c @@ -517,7 +517,7 @@ # wcstod.c # wcstok.c # wcstol.c -# wcstombs.c + wcstombs.c # wcstoul.c # wcsxfrm.c # wctomb.c Added: trunk/rostests/apitests/crt/mbstowcs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/mbstowcs.c?r… ============================================================================== --- trunk/rostests/apitests/crt/mbstowcs.c (added) +++ trunk/rostests/apitests/crt/mbstowcs.c [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -0,0 +1,25 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for mbstowcs + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <stdlib.h> +#include <specstrings.h> + +#define StrROS "ReactOS" + + +START_TEST(mbstowcs) +{ + size_t len; + + len = mbstowcs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0])); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = mbstowcs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0]) - 1); + ok(len == 7, "Got len = %u, excepting 7\n", len); +} Propchange: trunk/rostests/apitests/crt/mbstowcs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -1117,7 +1117,7 @@ # mbsdup_dbg # mbsrtowcs # mbsrtowcs_s -# mbstowcs.c + mbstowcs.c # mbstowcs_s Not exported in 2k3 Sp1 # mbtowc.c # memchr.c @@ -1250,7 +1250,7 @@ # wcstok.c # wcstok_s.c # wcstol.c -# wcstombs.c + wcstombs.c # wcstombs_s.c Not exported in 2k3 Sp1 # wcstoul.c # wcsxfrm.c Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -71,7 +71,7 @@ # isxdigit.c # labs.c # log.c -# mbstowcs.c + mbstowcs.c # memchr.c # memcmp.c # memcpy == memmove @@ -120,7 +120,7 @@ # wcsstr.c # wcstok.c # wcstol.c -# wcstombs.c + wcstombs.c # wcstoul.c ) Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -12,15 +12,19 @@ #endif extern void func__vsnprintf(void); extern void func__vsnwprintf(void); +extern void func_mbstowcs(void); extern void func_sprintf(void); extern void func_strcpy(void); +extern void func_wcstombs(void); const struct test winetest_testlist[] = { { "_vsnprintf", func__vsnprintf }, { "_vsnwprintf", func__vsnwprintf }, + { "mbstowcs", func_mbstowcs }, { "sprintf", func_sprintf }, { "strcpy", func_strcpy }, + { "wcstombs", func_wcstombs }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) // ... #endif Added: trunk/rostests/apitests/crt/wcstombs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstombs.c?r… ============================================================================== --- trunk/rostests/apitests/crt/wcstombs.c (added) +++ trunk/rostests/apitests/crt/wcstombs.c [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -0,0 +1,25 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for wcstombs + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <stdlib.h> +#include <specstrings.h> + +#define StrROS L"ReactOS" + + +START_TEST(wcstombs) +{ + size_t len; + + len = wcstombs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0])); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = wcstombs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0]) - 1); + ok(len == 7, "Got len = %u, excepting 7\n", len); +} Propchange: trunk/rostests/apitests/crt/wcstombs.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 2 months

[tfaber] 69679: [WIN32K:NTUSER] - Make CaretInfo part of the USER_MESSAGE_QUEUE structure since the pointer can no longer change CORE-10395

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 24 15:46:34 2015 New Revision: 69679 URL: http://svn.reactos.org/svn/reactos?rev=69679&view=rev Log: [WIN32K:NTUSER] - Make CaretInfo part of the USER_MESSAGE_QUEUE structure since the pointer can no longer change CORE-10395 Modified: trunk/reactos/win32ss/user/ntuser/caret.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/scrollex.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -101,7 +101,7 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if (ThreadQueue->CaretInfo->hWnd != hwnd) + if (ThreadQueue->CaretInfo.hWnd != hwnd) { TRACE("Not the same caret window!\n"); return; @@ -126,8 +126,8 @@ { case IDCARETTIMER: { - ThreadQueue->CaretInfo->Showing = (ThreadQueue->CaretInfo->Showing ? 0 : 1); - co_IntDrawCaret(pWnd, ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo.Showing = (ThreadQueue->CaretInfo.Showing ? 0 : 1); + co_IntDrawCaret(pWnd, &ThreadQueue->CaretInfo); } } return; @@ -155,18 +155,18 @@ { PUSER_MESSAGE_QUEUE ThreadQueue; PWND pWnd; - ThreadQueue = (PUSER_MESSAGE_QUEUE)Win32Thread->MessageQueue; - - if(!ThreadQueue || !ThreadQueue->CaretInfo) - return FALSE; - - pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo->hWnd); - co_IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; - ThreadQueue->CaretInfo->hWnd = (HWND)0; - ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; - ThreadQueue->CaretInfo->Showing = 0; - ThreadQueue->CaretInfo->Visible = 0; + ThreadQueue = Win32Thread->MessageQueue; + + if (!ThreadQueue) + return FALSE; + + pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo.hWnd); + co_IntHideCaret(&ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo.Bitmap = (HBITMAP)0; + ThreadQueue->CaretInfo.hWnd = (HWND)0; + ThreadQueue->CaretInfo.Size.cx = ThreadQueue->CaretInfo.Size.cy = 0; + ThreadQueue->CaretInfo.Showing = 0; + ThreadQueue->CaretInfo.Visible = 0; if (pWnd) { IntNotifyWinEvent(EVENT_OBJECT_DESTROY, pWnd, OBJID_CARET, CHILDID_SELF, 0); @@ -201,16 +201,16 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if(ThreadQueue->CaretInfo->hWnd) - { - pWnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); - if(ThreadQueue->CaretInfo->Pos.x != X || ThreadQueue->CaretInfo->Pos.y != Y) - { - co_IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Showing = 1; - ThreadQueue->CaretInfo->Pos.x = X; - ThreadQueue->CaretInfo->Pos.y = Y; - co_IntDrawCaret(pWnd, ThreadQueue->CaretInfo); + if(ThreadQueue->CaretInfo.hWnd) + { + pWnd = UserGetWindowObject(ThreadQueue->CaretInfo.hWnd); + if(ThreadQueue->CaretInfo.Pos.x != X || ThreadQueue->CaretInfo.Pos.y != Y) + { + co_IntHideCaret(&ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo.Showing = 1; + ThreadQueue->CaretInfo.Pos.x = X; + ThreadQueue->CaretInfo.Pos.y = Y; + co_IntDrawCaret(pWnd, &ThreadQueue->CaretInfo); IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM); IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_CARET, CHILDID_SELF, 0); @@ -237,20 +237,20 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if(Window && ThreadQueue->CaretInfo->hWnd != Window->head.h) + if(Window && ThreadQueue->CaretInfo.hWnd != Window->head.h) { EngSetLastError(ERROR_ACCESS_DENIED); return FALSE; } - if(ThreadQueue->CaretInfo->Visible) - { - PWND pwnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); + if(ThreadQueue->CaretInfo.Visible) + { + PWND pwnd = UserGetWindowObject(ThreadQueue->CaretInfo.hWnd); IntKillTimer(pwnd, IDCARETTIMER, TRUE); - co_IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + co_IntHideCaret(&ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo.Visible = 0; + ThreadQueue->CaretInfo.Showing = 0; } return TRUE; @@ -273,17 +273,17 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if(Window && ThreadQueue->CaretInfo->hWnd != Window->head.h) + if(Window && ThreadQueue->CaretInfo.hWnd != Window->head.h) { EngSetLastError(ERROR_ACCESS_DENIED); return FALSE; } - if (!ThreadQueue->CaretInfo->Visible) - { - ThreadQueue->CaretInfo->Visible = 1; - pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo->hWnd); - if (!ThreadQueue->CaretInfo->Showing && pWnd) + if (!ThreadQueue->CaretInfo.Visible) + { + ThreadQueue->CaretInfo.Visible = 1; + pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo.hWnd); + if (!ThreadQueue->CaretInfo.Showing && pWnd) { IntNotifyWinEvent(EVENT_OBJECT_SHOW, pWnd, OBJID_CARET, OBJID_CARET, 0); } @@ -324,17 +324,17 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if (ThreadQueue->CaretInfo->Visible) + if (ThreadQueue->CaretInfo.Visible) { IntKillTimer(Window, IDCARETTIMER, TRUE); - co_IntHideCaret(ThreadQueue->CaretInfo); - } - - ThreadQueue->CaretInfo->hWnd = hWnd; + co_IntHideCaret(&ThreadQueue->CaretInfo); + } + + ThreadQueue->CaretInfo.hWnd = hWnd; if(hBitmap) { - ThreadQueue->CaretInfo->Bitmap = hBitmap; - ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; + ThreadQueue->CaretInfo.Bitmap = hBitmap; + ThreadQueue->CaretInfo.Size.cx = ThreadQueue->CaretInfo.Size.cy = 0; } else { @@ -346,12 +346,12 @@ { nHeight = UserGetSystemMetrics(SM_CYBORDER); } - ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; - ThreadQueue->CaretInfo->Size.cx = nWidth; - ThreadQueue->CaretInfo->Size.cy = nHeight; - } - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + ThreadQueue->CaretInfo.Bitmap = (HBITMAP)0; + ThreadQueue->CaretInfo.Size.cx = nWidth; + ThreadQueue->CaretInfo.Size.cy = nHeight; + } + ThreadQueue->CaretInfo.Visible = 0; + ThreadQueue->CaretInfo.Showing = 0; IntSetTimer( Window, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM ); @@ -396,7 +396,7 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - Status = MmCopyToCaller(lpPoint, &(ThreadQueue->CaretInfo->Pos), sizeof(POINT)); + Status = MmCopyToCaller(lpPoint, &ThreadQueue->CaretInfo.Pos, sizeof(POINT)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -524,9 +524,9 @@ ptiTo->MessageQueue->spwndFocus = ptiFrom->MessageQueue->spwndFocus; ptiTo->MessageQueue->spwndCapture = ptiFrom->MessageQueue->spwndCapture; ptiTo->MessageQueue->QF_flags ^= ((ptiTo->MessageQueue->QF_flags ^ ptiFrom->MessageQueue->QF_flags) & QF_CAPTURELOCKED); - RtlCopyMemory(ptiTo->MessageQueue->CaretInfo, - ptiFrom->MessageQueue->CaretInfo, - sizeof(*ptiTo->MessageQueue->CaretInfo)); + RtlCopyMemory(&ptiTo->MessageQueue->CaretInfo, + &ptiFrom->MessageQueue->CaretInfo, + sizeof(ptiTo->MessageQueue->CaretInfo)); IntSetFocusMessageQueue(NULL); IntSetFocusMessageQueue(ptiTo->MessageQueue); gptiForeground = ptiTo; Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -394,7 +394,7 @@ if ( Desktop ) MsgQueue = Desktop->ActiveMessageQueue; } - CaretInfo = MsgQueue->CaretInfo; + CaretInfo = &MsgQueue->CaretInfo; SafeGui.flags = (CaretInfo->Visible ? GUI_CARETBLINKING : 0); /* Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -2080,7 +2080,6 @@ BOOLEAN FASTCALL MsqInitializeMessageQueue(PTHREADINFO pti, PUSER_MESSAGE_QUEUE MessageQueue) { - MessageQueue->CaretInfo = (PTHRDCARETINFO)(MessageQueue + 1); InitializeListHead(&MessageQueue->HardwareMessagesListHead); // Keep here! MessageQueue->spwndFocus = NULL; MessageQueue->iCursorLevel = 0; @@ -2269,16 +2268,16 @@ { PUSER_MESSAGE_QUEUE MessageQueue; - MessageQueue = (PUSER_MESSAGE_QUEUE)ExAllocatePoolWithTag(NonPagedPool, - sizeof(USER_MESSAGE_QUEUE) + sizeof(THRDCARETINFO), - USERTAG_Q); + MessageQueue = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*MessageQueue), + USERTAG_Q); if (!MessageQueue) { return NULL; } - RtlZeroMemory(MessageQueue, sizeof(USER_MESSAGE_QUEUE) + sizeof(THRDCARETINFO)); + RtlZeroMemory(MessageQueue, sizeof(*MessageQueue)); /* hold at least one reference until it'll be destroyed */ IntReferenceMessageQueue(MessageQueue); /* initialize the queue */ @@ -2406,9 +2405,8 @@ MessageQueue->MoveSize = hWnd; return Prev; case MSQ_STATE_CARET: - ASSERT(MessageQueue->CaretInfo); - Prev = MessageQueue->CaretInfo->hWnd; - MessageQueue->CaretInfo->hWnd = hWnd; + Prev = MessageQueue->CaretInfo.hWnd; + MessageQueue->CaretInfo.hWnd = hWnd; return Prev; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -67,8 +67,6 @@ HWND MenuOwner; /* Identifes the menu state */ BYTE MenuState; - /* Caret information for this queue */ - PTHRDCARETINFO CaretInfo; /* Message Queue Flags */ DWORD QF_flags; DWORD cThreads; // Shared message queue counter. @@ -85,6 +83,8 @@ /* Cursor object */ PCURICON_OBJECT CursorObject; + /* Caret information for this queue */ + THRDCARETINFO CaretInfo; } USER_MESSAGE_QUEUE, *PUSER_MESSAGE_QUEUE; #define QF_UPDATEKEYSTATE 0x00000001 Modified: trunk/reactos/win32ss/user/ntuser/scrollex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -27,7 +27,7 @@ Desktop = pti->rpdesk; ActiveMessageQueue = Desktop->ActiveMessageQueue; if (!ActiveMessageQueue) return 0; - CaretInfo = ActiveMessageQueue->CaretInfo; + CaretInfo = &ActiveMessageQueue->CaretInfo; hWndCaret = CaretInfo->hWnd; WndCaret = ValidateHwndNoErr(hWndCaret); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -417,7 +417,7 @@ } } - if (ti->MessageQueue->CaretInfo->hWnd == UserHMGetHandle(Window)) + if (ti->MessageQueue->CaretInfo.hWnd == UserHMGetHandle(Window)) { co_IntDestroyCaret(ti); }

9 years, 2 months

[tfaber] 69678: [WIN32K:NTUSER] - Copy the right size... CORE-10395

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 24 15:14:09 2015 New Revision: 69678 URL: http://svn.reactos.org/svn/reactos?rev=69678&view=rev Log: [WIN32K:NTUSER] - Copy the right size... CORE-10395 Modified: trunk/reactos/win32ss/user/ntuser/input.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Sat Oct 24 15:14:09 2015 @@ -526,7 +526,7 @@ ptiTo->MessageQueue->QF_flags ^= ((ptiTo->MessageQueue->QF_flags ^ ptiFrom->MessageQueue->QF_flags) & QF_CAPTURELOCKED); RtlCopyMemory(ptiTo->MessageQueue->CaretInfo, ptiFrom->MessageQueue->CaretInfo, - sizeof(ptiTo->MessageQueue->CaretInfo)); + sizeof(*ptiTo->MessageQueue->CaretInfo)); IntSetFocusMessageQueue(NULL); IntSetFocusMessageQueue(ptiTo->MessageQueue); gptiForeground = ptiTo;

9 years, 2 months

← Newer
1
...
6
7
8
9
10
11
12
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2015