Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[akhaldi] 61409: [MAPI32] * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 25 15:03:21 2013 New Revision: 61409 URL: http://svn.reactos.org/svn/reactos?rev=61409&view=rev Log: [MAPI32] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/mapi32/guid.c (with props) Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt trunk/reactos/dll/win32/mapi32/precomp.h Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] Wed Dec 25 15:03:21 2013 @@ -10,11 +10,12 @@ sendmail.c util.c stubs.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/mapi32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) add_library(mapi32 SHARED ${SOURCE} version.rc) set_module_type(mapi32 win32dll) -target_link_libraries(mapi32 wine) +target_link_libraries(mapi32 uuid wine) add_importlibs(mapi32 shlwapi user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET mapi32 DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/mapi32/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/guid.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/guid.c (added) +++ trunk/reactos/dll/win32/mapi32/guid.c [iso-8859-1] Wed Dec 25 15:03:21 2013 @@ -0,0 +1,15 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <mapiguid.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/mapi32/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mapi32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/mapi32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/precomp.h [iso-8859-1] Wed Dec 25 15:03:21 2013 @@ -16,7 +16,6 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> -#include <initguid.h> #include <mapival.h> #include <mapiutil.h>

10 years, 8 months

[akhaldi] 61408: * Remove incorrect headers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 25 14:56:05 2013 New Revision: 61408 URL: http://svn.reactos.org/svn/reactos?rev=61408&view=rev Log: * Remove incorrect headers. Modified: trunk/reactos/dll/win32/hhctrl.ocx/guid.c trunk/reactos/dll/win32/inetcomm/guid.c trunk/reactos/dll/win32/itss/guid.c Modified: trunk/reactos/dll/win32/hhctrl.ocx/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/guid.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/guid.c [iso-8859-1] Wed Dec 25 14:56:05 2013 @@ -1,22 +1,3 @@ -/* - * ReactOS Access Control List Editor - * Copyright (C) 2004-2005 ReactOS Team - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ #include <stdarg.h> Modified: trunk/reactos/dll/win32/inetcomm/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/guid.c [iso-8859-1] Wed Dec 25 14:56:05 2013 @@ -1,22 +1,3 @@ -/* - * ReactOS Access Control List Editor - * Copyright (C) 2004-2005 ReactOS Team - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ #include <stdarg.h> Modified: trunk/reactos/dll/win32/itss/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/guid.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/itss/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/guid.c [iso-8859-1] Wed Dec 25 14:56:05 2013 @@ -1,22 +1,3 @@ -/* - * ReactOS Access Control List Editor - * Copyright (C) 2004-2005 ReactOS Team - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ #include <stdarg.h>

10 years, 8 months

[akhaldi] 61407: [ITSS] * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 25 14:53:25 2013 New Revision: 61407 URL: http://svn.reactos.org/svn/reactos?rev=61407&view=rev Log: [ITSS] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/itss/guid.c (with props) Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt trunk/reactos/dll/win32/itss/precomp.h Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] Wed Dec 25 14:53:25 2013 @@ -11,6 +11,7 @@ moniker.c protocol.c storage.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/itss.def) Added: trunk/reactos/dll/win32/itss/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/guid.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/itss/guid.c (added) +++ trunk/reactos/dll/win32/itss/guid.c [iso-8859-1] Wed Dec 25 14:53:25 2013 @@ -0,0 +1,34 @@ +/* + * ReactOS Access Control List Editor + * Copyright (C) 2004-2005 ReactOS Team + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <wine/itss.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/itss/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/itss/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/precomp.h?r… ============================================================================== --- trunk/reactos/dll/win32/itss/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/precomp.h [iso-8859-1] Wed Dec 25 14:53:25 2013 @@ -15,7 +15,6 @@ #include <windef.h> #include <winbase.h> #include <ole2.h> -#include <initguid.h> #include <wine/itss.h> #include <wine/unicode.h>

10 years, 8 months

[akhaldi] 61406: [INETCOMM] * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 25 14:46:47 2013 New Revision: 61406 URL: http://svn.reactos.org/svn/reactos?rev=61406&view=rev Log: [INETCOMM] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/inetcomm/guid.c (with props) Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt trunk/reactos/dll/win32/inetcomm/inetcomm_private.h Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] Wed Dec 25 14:46:47 2013 @@ -11,6 +11,7 @@ mimeole.c pop3transport.c smtptransport.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/inetcomm_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def) Added: trunk/reactos/dll/win32/inetcomm/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/guid.c (added) +++ trunk/reactos/dll/win32/inetcomm/guid.c [iso-8859-1] Wed Dec 25 14:46:47 2013 @@ -0,0 +1,35 @@ +/* + * ReactOS Access Control List Editor + * Copyright (C) 2004-2005 ReactOS Team + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <imnxport.h> +#include <mimeole.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/inetcomm/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] Wed Dec 25 14:46:47 2013 @@ -31,7 +31,6 @@ #include <windef.h> #include <winbase.h> #include <ole2.h> -#include <initguid.h> #include <mimeole.h> #include <winsock2.h> #include <imnxport.h>

10 years, 8 months

[akhaldi] 61405: [HNETCFG] * Remove unneeded inclusion. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 25 14:36:37 2013 New Revision: 61405 URL: http://svn.reactos.org/svn/reactos?rev=61405&view=rev Log: [HNETCFG] * Remove unneeded inclusion. CORE-7716 Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] Wed Dec 25 14:36:37 2013 @@ -26,8 +26,6 @@ #define COBJMACROS -#include <initguid.h> - #include <windef.h> #include <winbase.h> #include <objbase.h>

10 years, 8 months

[akhaldi] 61404: [ITSS_GUID] * We no longer need this library.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 25 14:26:18 2013 New Revision: 61404 URL: http://svn.reactos.org/svn/reactos?rev=61404&view=rev Log: [ITSS_GUID] * We no longer need this library. Modified: trunk/reactos/include/reactos/wine/CMakeLists.txt Modified: trunk/reactos/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/CMake… ============================================================================== --- trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] Wed Dec 25 14:26:18 2013 @@ -1,3 +1,2 @@ add_idl_headers(wineheaders itss.idl winedxgi.idl) -add_iid_library(itss_guid itss.idl)

10 years, 8 months

[akhaldi] 61403: [HHCTRL.OCX] * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 25 14:23:09 2013 New Revision: 61403 URL: http://svn.reactos.org/svn/reactos?rev=61403&view=rev Log: [HHCTRL.OCX] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/hhctrl.ocx/guid.c (with props) Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/CMake… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Wed Dec 25 14:23:09 2013 @@ -15,6 +15,7 @@ search.c stream.c webbrowser.c + guid.c hhctrl.rc ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) @@ -30,7 +31,7 @@ add_dependencies(hhctrl stdole2) set_module_type(hhctrl win32ocx) -target_link_libraries(hhctrl uuid wine itss_guid) +target_link_libraries(hhctrl uuid wine) add_importlibs(hhctrl advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll) add_dependencies(hhctrl wineheaders) add_pch(hhctrl hhctrl.h) Added: trunk/reactos/dll/win32/hhctrl.ocx/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/guid.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/guid.c (added) +++ trunk/reactos/dll/win32/hhctrl.ocx/guid.c [iso-8859-1] Wed Dec 25 14:23:09 2013 @@ -0,0 +1,34 @@ +/* + * ReactOS Access Control List Editor + * Copyright (C) 2004-2005 ReactOS Team + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <wine/itss.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/hhctrl.ocx/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] Wed Dec 25 14:23:09 2013 @@ -31,8 +31,6 @@ #define COBJMACROS -#include <initguid.h> - #include <windef.h> #include <winbase.h> #include <winuser.h>

10 years, 8 months

[akhaldi] 61402: [AVIFIL32] * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 25 13:27:32 2013 New Revision: 61402 URL: http://svn.reactos.org/svn/reactos?rev=61402&view=rev Log: [AVIFIL32] * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/avifil32/guid.c (with props) Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/editstream.c Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Wed Dec 25 13:27:32 2013 @@ -17,10 +17,11 @@ icmstream.c tmpfile.c wavfile.c + guid.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) -target_link_libraries(avifil32 uuid wine) +target_link_libraries(avifil32 wine) add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] Wed Dec 25 13:27:32 2013 @@ -27,8 +27,6 @@ #define COM_NO_WINDOWS_H #define COBJMACROS - -#include <initguid.h> #include <windef.h> #include <winbase.h> Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] Wed Dec 25 13:27:32 2013 @@ -17,6 +17,8 @@ */ #include "avifile_private.h" + +#include <initguid.h> /***********************************************************************/ Added: trunk/reactos/dll/win32/avifil32/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/avifil32/guid.c (added) +++ trunk/reactos/dll/win32/avifil32/guid.c [iso-8859-1] Wed Dec 25 13:27:32 2013 @@ -0,0 +1,19 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <initguid.h> +#include <vfw.h> + +DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0); +DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); +DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0); + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/avifil32/guid.c ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 8 months

[ekohl] 61401: [LSASRV][MSV1_0] - Move the creation of the default DACL from msv1_0 to lsasrv. Create the default DACL only if the selected authentication package does not provide one.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Dec 25 13:24:42 2013 New Revision: 61401 URL: http://svn.reactos.org/svn/reactos?rev=61401&view=rev Log: [LSASRV][MSV1_0] - Move the creation of the default DACL from msv1_0 to lsasrv. Create the default DACL only if the selected authentication package does not provide one. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lookup.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Wed Dec 25 13:24:42 2013 @@ -547,9 +547,9 @@ PTOKEN_GROUPS LocalGroups = NULL; ULONG SidHeaderLength = 0; PSID SidHeader = NULL; - PSID Sid; + PSID SrcSid, DstSid; ULONG SidLength; - ULONG CopiedSids = 0; + ULONG AllocatedSids = 0; ULONG i; NTSTATUS Status; @@ -585,8 +585,10 @@ for (i = 0; i < ClientGroupsCount; i++) { + SrcSid = LocalGroups->Groups[i].Sid; + Status = NtReadVirtualMemory(LogonContext->ClientProcessHandle, - LocalGroups->Groups[i].Sid, + SrcSid, SidHeader, SidHeaderLength, NULL); @@ -596,28 +598,28 @@ SidLength = RtlLengthSid(SidHeader); TRACE("Sid %lu: Length %lu\n", i, SidLength); - Sid = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - SidLength); - if (SidHeader == NULL) + DstSid = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + SidLength); + if (DstSid == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } Status = NtReadVirtualMemory(LogonContext->ClientProcessHandle, - LocalGroups->Groups[i].Sid, - Sid, + SrcSid, + DstSid, SidLength, NULL); if (!NT_SUCCESS(Status)) { - RtlFreeHeap(RtlGetProcessHeap(), 0, Sid); + RtlFreeHeap(RtlGetProcessHeap(), 0, DstSid); goto done; } - LocalGroups->Groups[i].Sid = Sid; - CopiedSids++; + LocalGroups->Groups[i].Sid = DstSid; + AllocatedSids++; } *TokenGroups = LocalGroups; @@ -630,7 +632,7 @@ { if (LocalGroups != NULL) { - for (i = 0; i < CopiedSids; i++) + for (i = 0; i < AllocatedSids; i++) RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups->Groups[i].Sid); RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups); @@ -638,6 +640,52 @@ } return Status; +} + + +static +NTSTATUS +LsapAddTokenDefaultDacl( + IN PVOID TokenInformation, + IN LSA_TOKEN_INFORMATION_TYPE TokenInformationType) +{ + PLSA_TOKEN_INFORMATION_V1 TokenInfo1; + PACL Dacl = NULL; + ULONG Length; + + if (TokenInformationType == LsaTokenInformationV1) + { + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + + if (TokenInfo1->DefaultDacl.DefaultDacl != NULL) + return STATUS_SUCCESS; + + Length = sizeof(ACL) + + (2 * sizeof(ACCESS_ALLOWED_ACE)) + + RtlLengthSid(TokenInfo1->Owner.Owner) + + RtlLengthSid(LsapLocalSystemSid); + + Dacl = DispatchTable.AllocateLsaHeap(Length); + if (Dacl == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCreateAcl(Dacl, Length, ACL_REVISION); + + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + TokenInfo1->Owner.Owner); + + /* SID: S-1-5-18 */ + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + LsapLocalSystemSid); + + TokenInfo1->DefaultDacl.DefaultDacl = Dacl; + } + + return STATUS_SUCCESS; } @@ -669,7 +717,7 @@ Package = LsapGetAuthenticationPackage(PackageId); if (Package == NULL) { - TRACE("LsapGetAuthenticationPackage() failed to find a package\n"); + ERR("LsapGetAuthenticationPackage() failed to find a package\n"); return STATUS_NO_SUCH_PACKAGE; } @@ -681,7 +729,7 @@ RequestMsg->LogonUser.Request.AuthenticationInformationLength); if (LocalAuthInfo == NULL) { - TRACE("RtlAllocateHeap() failed\n"); + ERR("RtlAllocateHeap() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -693,7 +741,7 @@ NULL); if (!NT_SUCCESS(Status)) { - TRACE("NtReadVirtualMemory() failed (Status 0x%08lx)\n", Status); + ERR("NtReadVirtualMemory() failed (Status 0x%08lx)\n", Status); RtlFreeHeap(RtlGetProcessHeap(), 0, LocalAuthInfo); return Status; } @@ -706,7 +754,10 @@ RequestMsg->LogonUser.Request.LocalGroupsCount, &LocalGroups); if (!NT_SUCCESS(Status)) + { + ERR("LsapCopyLocalGroups failed (Status 0x%08lx)\n", Status); goto done; + } TRACE("GroupCount: %lu\n", LocalGroups->GroupCount); } @@ -766,7 +817,16 @@ if (!NT_SUCCESS(Status)) { - TRACE("LsaApLogonUser/Ex/2 failed (Status 0x%08lx)\n", Status); + ERR("LsaApLogonUser/Ex/2 failed (Status 0x%08lx)\n", Status); + goto done; + } + + + Status = LsapAddTokenDefaultDacl(TokenInformation, + TokenInformationType); + if (!NT_SUCCESS(Status)) + { + ERR("LsapAddTokenDefaultDacl() failed (Status 0x%08lx)\n", Status); goto done; } @@ -802,7 +862,7 @@ &RequestMsg->LogonUser.Request.SourceContext); if (!NT_SUCCESS(Status)) { - TRACE("NtCreateToken failed (Status 0x%08lx)\n", Status); + ERR("NtCreateToken failed (Status 0x%08lx)\n", Status); goto done; } } @@ -823,7 +883,7 @@ DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES | DUPLICATE_CLOSE_SOURCE); if (!NT_SUCCESS(Status)) { - TRACE("NtDuplicateObject failed (Status 0x%08lx)\n", Status); + ERR("NtDuplicateObject failed (Status 0x%08lx)\n", Status); goto done; } @@ -832,7 +892,7 @@ Status = LsapSetLogonSessionData(&RequestMsg->LogonUser.Reply.LogonId); if (!NT_SUCCESS(Status)) { - TRACE("LsapSetLogonSessionData failed (Status 0x%08lx)\n", Status); + ERR("LsapSetLogonSessionData failed (Status 0x%08lx)\n", Status); goto done; } @@ -847,7 +907,10 @@ if (LocalGroups != NULL) { for (i = 0; i < LocalGroups->GroupCount; i++) - RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups->Groups[i].Sid); + { + if (LocalGroups->Groups[i].Sid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups->Groups[i].Sid); + } RtlFreeHeap(RtlGetProcessHeap(), 0, LocalGroups); } Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Wed Dec 25 13:24:42 2013 @@ -80,6 +80,7 @@ LIST_ENTRY WellKnownSidListHead; +PSID LsapLocalSystemSid = NULL; /* FUNCTIONS ***************************************************************/ @@ -90,7 +91,8 @@ PULONG SubAuthorities, PWSTR AccountName, PWSTR DomainName, - SID_NAME_USE Use) + SID_NAME_USE Use, + PSID *SidPtr) { PWELL_KNOWN_SID SidEntry; PULONG p; @@ -159,6 +161,9 @@ InsertTailList(&WellKnownSidListHead, &SidEntry->ListEntry); + if (SidPtr != NULL) + *SidPtr = SidEntry->Sid; + return TRUE; } @@ -184,7 +189,8 @@ NULL, szAccountName, szDomainName, - SidTypeDomain); + SidTypeDomain, + NULL); /* Null Sid */ LsapLoadString(hInstance, IDS_NULL_RID, szAccountName, 80); @@ -195,7 +201,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* World Sid */ LsapLoadString(hInstance, IDS_WORLD_RID, szAccountName, 80); @@ -206,7 +213,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Local Sid */ LsapLoadString(hInstance, IDS_LOCAL_RID, szAccountName, 80); @@ -217,7 +225,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Creator Owner Sid */ LsapLoadString(hInstance, IDS_CREATOR_OWNER_RID, szAccountName, 80); @@ -228,7 +237,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Creator Group Sid */ LsapLoadString(hInstance, IDS_CREATOR_GROUP_RID, szAccountName, 80); @@ -239,7 +249,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Creator Owner Server Sid */ LsapLoadString(hInstance, IDS_CREATOR_OWNER_SERVER_RID, szAccountName, 80); @@ -250,7 +261,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Creator Group Server Sid */ LsapLoadString(hInstance, IDS_CREATOR_GROUP_SERVER_RID, szAccountName, 80); @@ -261,7 +273,8 @@ SubAuthorities, szAccountName, L"", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Dialup Sid */ LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); @@ -273,7 +286,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Network Sid */ LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); @@ -284,7 +298,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Batch Sid*/ LsapLoadString(hInstance, IDS_BATCH_RID, szAccountName, 80); @@ -295,7 +310,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Interactive Sid */ LsapLoadString(hInstance, IDS_INTERACTIVE_RID, szAccountName, 80); @@ -306,7 +322,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Service Sid */ LsapLoadString(hInstance, IDS_SERVICE_RID, szAccountName, 80); @@ -317,7 +334,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Anonymous Logon Sid */ LsapLoadString(hInstance, IDS_ANONYMOUS_LOGON_RID, szAccountName, 80); @@ -328,7 +346,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Proxy Sid */ LsapLoadString(hInstance, IDS_PROXY_RID, szAccountName, 80); @@ -339,7 +358,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Enterprise Controllers Sid */ LsapLoadString(hInstance, IDS_ENTERPRISE_CONTROLLERS_RID, szAccountName, 80); @@ -350,7 +370,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Principal Self Sid */ LsapLoadString(hInstance, IDS_PRINCIPAL_SELF_RID, szAccountName, 80); @@ -361,7 +382,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Authenticated Users Sid */ LsapLoadString(hInstance, IDS_AUTHENTICATED_USER_RID, szAccountName, 80); @@ -372,7 +394,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Restricted Code Sid */ LsapLoadString(hInstance, IDS_RESTRICTED_CODE_RID, szAccountName, 80); @@ -383,7 +406,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Terminal Server Sid */ LsapLoadString(hInstance, IDS_TERMINAL_SERVER_RID, szAccountName, 80); @@ -394,7 +418,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Remote Logon Sid */ LsapLoadString(hInstance, IDS_REMOTE_LOGON_RID, szAccountName, 80); @@ -405,7 +430,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* This Organization Sid */ LsapLoadString(hInstance, IDS_THIS_ORGANIZATION_RID, szAccountName, 80); @@ -416,7 +442,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Local System Sid */ LsapLoadString(hInstance, IDS_LOCAL_SYSTEM_RID, szAccountName, 80); @@ -427,7 +454,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + &LsapLocalSystemSid); /* Local Service Sid */ LsapLoadString(hInstance, IDS_LOCAL_SERVICE_RID, szAccountName, 80); @@ -438,14 +466,16 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); LsapCreateSid(&NtAuthority, 1, SubAuthorities, L"LOCALSERVICE", L"NT AUTHORITY", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Network Service Sid */ LsapLoadString(hInstance, IDS_NETWORK_SERVICE_RID, szAccountName, 80); @@ -456,14 +486,16 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); LsapCreateSid(&NtAuthority, 1, SubAuthorities, L"NETWORKSERVICE", L"NT AUTHORITY", - SidTypeWellKnownGroup); + SidTypeWellKnownGroup, + NULL); /* Builtin Domain Sid */ LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szAccountName, 80); @@ -475,7 +507,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeDomain); + SidTypeDomain, + NULL); /* Administrators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_ADMINS, szAccountName, 80); @@ -487,7 +520,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Users Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_USERS, szAccountName, 80); @@ -499,7 +533,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Guests Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_GUESTS, szAccountName, 80); @@ -511,7 +546,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Power User Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_POWER_USERS, szAccountName, 80); @@ -523,7 +559,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Account Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_ACCOUNT_OPS, szAccountName, 80); @@ -535,7 +572,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* System Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_SYSTEM_OPS, szAccountName, 80); @@ -547,7 +585,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Print Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_PRINT_OPS, szAccountName, 80); @@ -559,7 +598,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Backup Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_BACKUP_OPS, szAccountName, 80); @@ -571,7 +611,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Replicators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_REPLICATOR, szAccountName, 80); @@ -583,7 +624,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* RAS Servers Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_RAS_SERVERS, szAccountName, 80); @@ -595,7 +637,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Pre-Windows 2000 Compatible Access Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_PREW2KCOMPACCESS, szAccountName, 80); @@ -607,7 +650,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Remote Desktop Users Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_REMOTE_DESKTOP_USERS, szAccountName, 80); @@ -619,7 +663,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* Network Configuration Operators Alias Sid */ LsapLoadString(hInstance, IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS, szAccountName, 80); @@ -631,7 +676,8 @@ SubAuthorities, szAccountName, szDomainName, - SidTypeAlias); + SidTypeAlias, + NULL); /* FIXME: Add more well known sids */ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Wed Dec 25 13:24:42 2013 @@ -91,6 +91,9 @@ extern PSID AccountDomainSid; extern UNICODE_STRING AccountDomainName; +extern PSID LsapLocalSystemSid; + + /* authpackage.c */ NTSTATUS LsapInitAuthPackages(VOID); Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Wed Dec 25 13:24:42 2013 @@ -573,66 +573,6 @@ static NTSTATUS -BuildTokenDefaultDacl(PTOKEN_DEFAULT_DACL DefaultDacl, - PSID OwnerSid) -{ - SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; - PSID LocalSystemSid = NULL; - PACL Dacl = NULL; - NTSTATUS Status = STATUS_SUCCESS; - - RtlAllocateAndInitializeSid(&SystemAuthority, - 1, - SECURITY_LOCAL_SYSTEM_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &LocalSystemSid); - - Dacl = DispatchTable.AllocateLsaHeap(1024); - if (Dacl == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - Status = RtlCreateAcl(Dacl, 1024, ACL_REVISION); - if (!NT_SUCCESS(Status)) - goto done; - - RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - GENERIC_ALL, - OwnerSid); - - /* SID: S-1-5-18 */ - RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - GENERIC_ALL, - LocalSystemSid); - - DefaultDacl->DefaultDacl = Dacl; - -done: - if (!NT_SUCCESS(Status)) - { - if (Dacl != NULL) - DispatchTable.FreeLsaHeap(Dacl); - } - - if (LocalSystemSid != NULL) - RtlFreeSid(LocalSystemSid); - - return Status; -} - - -static -NTSTATUS BuildTokenInformationBuffer(PLSA_TOKEN_INFORMATION_V1 *TokenInformation, PRPC_SID AccountDomainSid, ULONG RelativeId, @@ -680,11 +620,6 @@ Status = BuildTokenOwner(&Buffer->Owner, OwnerSid); - if (!NT_SUCCESS(Status)) - goto done; - - Status = BuildTokenDefaultDacl(&Buffer->DefaultDacl, - OwnerSid); if (!NT_SUCCESS(Status)) goto done;

10 years, 8 months

[akhaldi] 61400: [MSACM32] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions that already exist in the main header...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 25 11:46:57 2013 New Revision: 61400 URL: http://svn.reactos.org/svn/reactos?rev=61400&view=rev Log: [MSACM32] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions that already exist in the main header/resource file. CORE-7716 Modified: trunk/reactos/dll/win32/msacm32/driver.c trunk/reactos/dll/win32/msacm32/filter.c trunk/reactos/dll/win32/msacm32/format.c trunk/reactos/dll/win32/msacm32/internal.c trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc trunk/reactos/dll/win32/msacm32/msacm32_main.c trunk/reactos/dll/win32/msacm32/msacm_main.c trunk/reactos/dll/win32/msacm32/pcmconverter.c trunk/reactos/dll/win32/msacm32/stream.c trunk/reactos/dll/win32/msacm32/wineacm.h Modified: trunk/reactos/dll/win32/msacm32/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/driver.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/driver.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -21,28 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * acmDriverAddA (MSACM32.@) Modified: trunk/reactos/dll/win32/msacm32/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/filter.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/filter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/filter.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -20,23 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -//#include "winerror.h" -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * acmFilterChooseA (MSACM32.@) Modified: trunk/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/format.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,25 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> -//#include <string.h> -#include <windef.h> -//#include "winbase.h" -//#include "winnls.h" -//#include "winerror.h" -#include <wingdi.h> -#include <winuser.h> -#include <wine/unicode.h> -#include <wine/debug.h> -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); struct MSACM_FillFormatData { HWND hWnd; Modified: trunk/reactos/dll/win32/msacm32/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/internal… ============================================================================== --- trunk/reactos/dll/win32/msacm32/internal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/internal.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -21,26 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -#include <winuser.h> -//#include "winerror.h" +#include "wineacm.h" + #include <winreg.h> -//#include "mmsystem.h" -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> -#include "wineacm.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /**********************************************************************/ Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * 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 "wineacm.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * 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 "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * 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 "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -18,8 +18,6 @@ * 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 "wineacm.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -18,8 +18,6 @@ * 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 "wineacm.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -19,8 +19,6 @@ * 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 "wineacm.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -16,8 +16,6 @@ * 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 "wineacm.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -17,8 +17,6 @@ * 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 "wineacm.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/msacm32/msacm32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32_… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32_main.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -21,21 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -#include <wine/debug.h> -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /**********************************************************************/ Modified: trunk/reactos/dll/win32/msacm32/msacm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_ma… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_main.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "mmsystem.h" -#include "mmreg.h" -#include "msacm.h" -#include "msacmdrv.h" #include "wineacm.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /************************************************************************** * DllEntryPoint (MSACM.255) Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/pcmconve… ============================================================================== --- trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -26,30 +26,9 @@ * embedded driver handling scheme in msacm32.dll which isn't done yet */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "wineacm.h" #include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -//#include "wingdi.h" -#include <winnls.h> -#include <winuser.h> - -#include <msacmdrv.h> -//#include "wineacm.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * PCM_drvOpen Modified: trunk/reactos/dll/win32/msacm32/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/stream.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -28,22 +28,7 @@ * + properly close ACM streams */ -#define WIN32_NO_STATUS - -//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "mmsystem.h" -#define NOBITMAP -//#include "mmreg.h" -//#include "msacm.h" -#include <msacmdrv.h> #include "wineacm.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msacm); static PWINE_ACMSTREAM ACM_GetStream(HACMSTREAM has) { Modified: trunk/reactos/dll/win32/msacm32/wineacm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/wineacm.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/wineacm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/wineacm.h [iso-8859-1] Wed Dec 25 11:46:57 2013 @@ -20,8 +20,20 @@ #ifndef __WINE_WINEACM_H #define __WINE_WINEACM_H -//#include <windef.h> -//#include <winuser.h> +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define NOBITMAP + +#include <wine/msacmdrv.h> +#include <wine/unicode.h> + +#include <winuser.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msacm); /*********************************************************************** * Wine specific - Win32

10 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
31
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 December 2013