Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[ekohl] 61399: [LSASRV] Set session data after the logon token has been created. Still WIP.
by ekohl＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: ekohl Date: Wed Dec 25 11:36:17 2013 New Revision: 61399 URL: http://svn.reactos.org/svn/reactos?rev=61399&view=rev Log: [LSASRV] Set session data after the logon token has been created. Still WIP. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/session.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 11:36:17 2013 @@ -829,14 +829,12 @@ TokenHandle = NULL; -#if 0 Status = LsapSetLogonSessionData(&RequestMsg->LogonUser.Reply.LogonId); if (!NT_SUCCESS(Status)) { TRACE("LsapSetLogonSessionData failed (Status 0x%08lx)\n", Status); goto done; } -#endif done: if (!NT_SUCCESS(Status)) 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 11:36:17 2013 @@ -396,6 +396,9 @@ NTAPI LsapDeleteLogonSession(IN PLUID LogonId); +NTSTATUS +LsapSetLogonSessionData(IN PLUID LogonId); + /* utils.c */ INT LsapLoadString(HINSTANCE hInstance, Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Wed Dec 25 11:36:17 2013 @@ -50,6 +50,22 @@ } return NULL; +} + + +NTSTATUS +LsapSetLogonSessionData(IN PLUID LogonId) +{ + PLSAP_LOGON_SESSION Session; + + TRACE("()\n"); + + Session = LsapGetLogonSession(LogonId); + if (Session == NULL) + return STATUS_NO_SUCH_LOGON_SESSION; + + + return STATUS_SUCCESS; }

1 0

[akhaldi] 61398: [MPR] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already ...
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 11:26:57 2013 New Revision: 61398 URL: http://svn.reactos.org/svn/reactos?rev=61398&view=rev Log: [MPR] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Added: trunk/reactos/dll/win32/mpr/precomp.h (with props) Modified: trunk/reactos/dll/win32/mpr/auth.c trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc trunk/reactos/dll/win32/mpr/lang/mpr_De.rc trunk/reactos/dll/win32/mpr/lang/mpr_En.rc trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc trunk/reactos/dll/win32/mpr/lang/mpr_He.rc trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc trunk/reactos/dll/win32/mpr/lang/mpr_It.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc trunk/reactos/dll/win32/mpr/lang/mpr_No.rc trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/mpr/mpr_main.c trunk/reactos/dll/win32/mpr/mprres.h trunk/reactos/dll/win32/mpr/multinet.c trunk/reactos/dll/win32/mpr/netspi.h trunk/reactos/dll/win32/mpr/nps.c trunk/reactos/dll/win32/mpr/pwcache.c trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/auth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/auth.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/auth.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/auth.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,17 +18,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 <winnetwk.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); - +#include "precomp.h" /***************************************************************** * WNetLogoffA [MPR.@] Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Bg.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Cs.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Da.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_De.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_De.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_En.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_En.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Es.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Fr.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_He.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_He.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Hu.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_It.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_It.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ja.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ko.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Lt.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Nl.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_No.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_No.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Pl.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Pt.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ro.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ru.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Si.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Sv.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Tr.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Uk.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Zh.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc [iso-8859-1] Wed Dec 25 11:26: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 "mprres.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -17,10 +17,10 @@ * 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 "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "mprres.h" + +#include <winuser.h> + +#include "mprres.h" #include "version.rc" Modified: trunk/reactos/dll/win32/mpr/mpr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,18 +18,8 @@ * 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 "objbase.h" -//#include "winnetwk.h" -#include <wine/debug.h> +#include "precomp.h" #include "wnetpriv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); /* * FIXME: The following routines should use a private heap ... Modified: trunk/reactos/dll/win32/mpr/mprres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mprres.h?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/mprres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mprres.h [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,9 +18,6 @@ #ifndef __WINE_MPRRES_H__ #define __WINE_MPRRES_H__ -//#include <windef.h> -#include <winuser.h> - #define IDS_ENTIRENETWORK 1 #define IDD_PROXYDLG 0x400 Modified: trunk/reactos/dll/win32/mpr/multinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/multinet.c?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/multinet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/multinet.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -18,17 +18,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 <winnetwk.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); - +#include "precomp.h" /***************************************************************** * MultinetGetConnectionPerformanceA [MPR.@] Modified: trunk/reactos/dll/win32/mpr/netspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/netspi.h?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/netspi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/netspi.h [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -23,9 +23,6 @@ #ifndef _NETSPI_H_ #define _NETSPI_H_ - -//#include "windef.h" -#include <winnetwk.h> /* * Note: The Unicode variants of all these routines/structures Modified: trunk/reactos/dll/win32/mpr/nps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/nps.c?rev=61… ============================================================================== --- trunk/reactos/dll/win32/mpr/nps.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/nps.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -19,23 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <netspi.h> -#include <wine/debug.h> -//#include "winerror.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); - -//#include "wine/unicode.h" - +#include "precomp.h" + +#include "netspi.h" #include "mprres.h" /*********************************************************************** Added: trunk/reactos/dll/win32/mpr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/precomp.h (added) +++ trunk/reactos/dll/win32/mpr/precomp.h [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -0,0 +1,18 @@ +#ifndef _MPR_PCH_ +#define _MPR_PCH_ + +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <winnetwk.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + +#endif /* _MPR_PCH_ */ Propchange: trunk/reactos/dll/win32/mpr/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mpr/pwcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -19,18 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -//#include <stdarg.h> +#include "precomp.h" + #include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <winnetwk.h> -#include <winreg.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); static const char mpr_key[] = "Software\\Wine\\Wine\\Mpr\\"; Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Wed Dec 25 11:26:57 2013 @@ -20,25 +20,15 @@ * 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 "winnls.h" +#include "precomp.h" + #include <winioctl.h> -#include <winnetwk.h> #include <npapi.h> -#include <winreg.h> -//#include "winuser.h" #define WINE_MOUNTMGR_EXTENSIONS #include <ddk/mountmgr.h> -#include <wine/debug.h> #include <wine/unicode.h> + #include "mprres.h" -//#include "wnetpriv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mpr); /* Data structures representing network service providers. Assumes only one * thread creates them, and that they are constant for the life of the process

1 0

[akhaldi] 61397: [MMDEVAPI] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 11:10:09 2013 New Revision: 61397 URL: http://svn.reactos.org/svn/reactos?rev=61397&view=rev Log: [MMDEVAPI] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/mmdevapi/audiovolume.c trunk/reactos/dll/win32/mmdevapi/devenum.c trunk/reactos/dll/win32/mmdevapi/main.c trunk/reactos/dll/win32/mmdevapi/mmdevapi.h Modified: trunk/reactos/dll/win32/mmdevapi/audiovolume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/audiovo… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/audiovolume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/audiovolume.c [iso-8859-1] Wed Dec 25 11:10:09 2013 @@ -16,31 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define NONAMELESSUNION -#define COBJMACROS -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -#include "ole2.h" -#include "mmdeviceapi.h" -#include "mmsystem.h" -#include "dsound.h" -#include "audioclient.h" -#include "endpointvolume.h" -#include "audiopolicy.h" - #include "mmdevapi.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl; Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/devenum… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] Wed Dec 25 11:10:09 2013 @@ -16,33 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#define NONAMELESSUNION -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/unicode.h" - -#include "initguid.h" -#include "ole2.h" -#include "mmdeviceapi.h" -#include "dshow.h" -#include "dsound.h" -#include "audioclient.h" -#include "endpointvolume.h" -#include "audiopolicy.h" - #include "mmdevapi.h" -#include "devpkey.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +#define _WINDOWS_H +#include <ole2.h> +#include <dshow.h> +#include <devpkey.h> + +#include <wine/list.h> static const WCHAR software_mmdevapi[] = { 'S','o','f','t','w','a','r','e','\\', Modified: trunk/reactos/dll/win32/mmdevapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/main.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/main.c [iso-8859-1] Wed Dec 25 11:10:09 2013 @@ -17,36 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/library.h" - -#include "ole2.h" -#include "olectl.h" -#include "rpcproxy.h" -#include "propsys.h" -#include "propkeydef.h" -#include "mmdeviceapi.h" -#include "mmsystem.h" -#include "dsound.h" -#include "audioclient.h" -#include "endpointvolume.h" -#include "audiopolicy.h" -#include "devpkey.h" -#include "winreg.h" - #include "mmdevapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +#include <rpcproxy.h> static HINSTANCE instance; Modified: trunk/reactos/dll/win32/mmdevapi/mmdevapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/mmdevap… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] Wed Dec 25 11:10:09 2013 @@ -16,9 +16,32 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif +#include <wine/config.h> +#include <wine/port.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winreg.h> +#include <initguid.h> +#include <objbase.h> +#include <audiopolicy.h> +#include <endpointvolume.h> +#include <mmdeviceapi.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;

1 0

[akhaldi] 61396: * The infamous "Forgot this file"...
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 10:42:48 2013 New Revision: 61396 URL: http://svn.reactos.org/svn/reactos?rev=61396&view=rev Log: * The infamous "Forgot this file"... Modified: trunk/reactos/dll/win32/mmdrv/CMakeLists.txt Modified: trunk/reactos/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] Wed Dec 25 10:42:48 2013 @@ -1,6 +1,5 @@ -add_definitions(-DNDEBUG) spec2def(mmdrv.dll mmdrv.spec)

1 0

[akhaldi] 61395: [MMDRV] * Move some inclusions to the main header. * Do not include debug.h into the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 10:39:58 2013 New Revision: 61395 URL: http://svn.reactos.org/svn/reactos?rev=61395&view=rev Log: [MMDRV] * Move some inclusions to the main header. * Do not include debug.h into the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/mmdrv/common.c trunk/reactos/dll/win32/mmdrv/entry.c trunk/reactos/dll/win32/mmdrv/kernel.c trunk/reactos/dll/win32/mmdrv/mmddk.h trunk/reactos/dll/win32/mmdrv/mmdef.h trunk/reactos/dll/win32/mmdrv/mmdrv.h trunk/reactos/dll/win32/mmdrv/mme.c trunk/reactos/dll/win32/mmdrv/mmioctl.h trunk/reactos/dll/win32/mmdrv/session.c trunk/reactos/dll/win32/mmdrv/utils.c trunk/reactos/dll/win32/mmdrv/wave.c trunk/reactos/dll/win32/mmdrv/wave.h trunk/reactos/dll/win32/mmdrv/wave_io.c Modified: trunk/reactos/dll/win32/mmdrv/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/common.c?r… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/common.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/common.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,6 +11,9 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> + /* Translates errors to MMRESULT codes. */ Modified: trunk/reactos/dll/win32/mmdrv/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/entry.c?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/entry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/entry.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,6 +11,8 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> /* Nothing particularly special happens here. Modified: trunk/reactos/dll/win32/mmdrv/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/kernel.c?r… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/kernel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/kernel.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -10,6 +10,11 @@ */ #include "mmdrv.h" + +#include <winuser.h> + +#define NDEBUG +#include <debug.h> /* Devices that we provide access to follow a standard naming convention. Modified: trunk/reactos/dll/win32/mmdrv/mmddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmddk.h?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmddk.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmddk.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -27,7 +27,6 @@ #define __MMDDK_H #include <mmsystem.h> -//#include <winbase.h> typedef VOID (TASKCALLBACK) (DWORD dwInst); Modified: trunk/reactos/dll/win32/mmdrv/mmdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdef.h?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdef.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -16,17 +16,8 @@ #define EXPORT __declspec(dllexport) -//#include <stdio.h> -//#include <windows.h> -//#include <mmsystem.h> -//#include <mmddk.h> - // This needs to be done to get winioctl.h to work: //typedef unsigned __int64 DWORD64, *PDWORD64; - -//#include <winioctl.h> -//#include "mmddk.h" - #define SOUND_MAX_DEVICE_NAME 1024 // GUESSWORK #define SOUND_MAX_DEVICES 256 // GUESSWORK Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.h?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -14,14 +14,16 @@ #ifndef MMDRV_H #define MMDRV_H +#include <stdarg.h> + #define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN + +#include <windef.h> +#include <winbase.h> +#include <winioctl.h> #include "mmioctl.h" #include "mmddk.h" - -//#include <stdio.h> -#include <debug.h> /* Need to check these */ #define MAX_DEVICES 256 Modified: trunk/reactos/dll/win32/mmdrv/mme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mme.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,6 +11,9 @@ */ #include "mmdrv.h" + +#define NDEBUG +#include <debug.h> /* Sends a message to the client (application), such as WOM_DONE. This Modified: trunk/reactos/dll/win32/mmdrv/mmioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmioctl.h?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmioctl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmioctl.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,12 +11,6 @@ #ifndef MMDRV_IOCTLS #define MMDRV_IOCTLS - -#include <windows.h> -//#include <mmsystem.h> -//#include <mmddk.h> -#include <winioctl.h> - /* Base names of the supported devices, as provided by drivers running in Modified: trunk/reactos/dll/win32/mmdrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/session.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/session.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -11,6 +11,9 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> + /* Each session is tracked, but the list must be locked when in use */ SessionInfo* session_list = NULL; Modified: trunk/reactos/dll/win32/mmdrv/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/utils.c?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/utils.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -9,7 +9,7 @@ * Jan 30, 2004: Imported into ReactOS tree */ -//#include "mmdrv.h" +#include "mmdrv.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/mmdrv/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave.c?rev… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -12,6 +12,8 @@ #include "mmdrv.h" +#define NDEBUG +#include <debug.h> #define MAX_WAVE_BUFFER_SIZE 65536 Modified: trunk/reactos/dll/win32/mmdrv/wave.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave.h?rev… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/wave.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/wave.h [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -1,3 +1,4 @@ +#pragma once // FIXME: Should be moved somewhere else? typedef struct _WAVE_DD_VOLUME { Modified: trunk/reactos/dll/win32/mmdrv/wave_io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave_io.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/wave_io.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/wave_io.c [iso-8859-1] Wed Dec 25 10:39:58 2013 @@ -3,6 +3,9 @@ */ #include "mmdrv.h" + +#define NDEBUG +#include <debug.h> /* Complete a partial wave buffer transaction

1 0

[akhaldi] 61394: [I8042PRT] * A better way of handling GUIDs thanks to Timo. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 10:25:08 2013 New Revision: 61394 URL: http://svn.reactos.org/svn/reactos?rev=61394&view=rev Log: [I8042PRT] * A better way of handling GUIDs thanks to Timo. CORE-7716 Added: trunk/reactos/drivers/input/i8042prt/guid.c (with props) Modified: trunk/reactos/drivers/input/i8042prt/CMakeLists.txt trunk/reactos/drivers/input/i8042prt/i8042prt.h Modified: trunk/reactos/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/CMa… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Wed Dec 25 10:25:08 2013 @@ -9,6 +9,7 @@ ps2pp.c readwrite.c registry.c + guid.c i8042prt.rc) set_module_type(i8042prt kernelmodedriver) Added: trunk/reactos/drivers/input/i8042prt/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/gui… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/guid.c (added) +++ trunk/reactos/drivers/input/i8042prt/guid.c [iso-8859-1] Wed Dec 25 10:25:08 2013 @@ -0,0 +1,7 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <wdm.h> +#include <initguid.h> +#include <poclass.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/input/i8042prt/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] Wed Dec 25 10:25:08 2013 @@ -1,5 +1,3 @@ - -#define INITGUID #include <ntifs.h> #include <kbdmou.h>

1 0

[akhaldi] 61393: [USBSTOR] * A better way of handling GUIDs thanks to Timo. CORE-7716
by akhaldi＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: akhaldi Date: Wed Dec 25 10:21:22 2013 New Revision: 61393 URL: http://svn.reactos.org/svn/reactos?rev=61393&view=rev Log: [USBSTOR] * A better way of handling GUIDs thanks to Timo. CORE-7716 Added: trunk/reactos/drivers/usb/usbstor/guid.c (with props) Modified: trunk/reactos/drivers/usb/usbstor/CMakeLists.txt trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Wed Dec 25 10:21:22 2013 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.c scsi.c usbstor.c usbstor.rc) +add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.c scsi.c usbstor.c guid.c usbstor.rc) set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) Added: trunk/reactos/drivers/usb/usbstor/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/guid.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/guid.c (added) +++ trunk/reactos/drivers/usb/usbstor/guid.c [iso-8859-1] Wed Dec 25 10:21:22 2013 @@ -0,0 +1,9 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <ntdef.h> +#include <miniport.h> +#include <usb.h> +#include <initguid.h> +#include <usbbusif.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/usb/usbstor/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Wed Dec 25 10:21:22 2013 @@ -1,7 +1,5 @@ #pragma once - -#define INITGUID #include <ntddk.h> #include <usbdi.h>

1 0

[akhaldi] 61392: [MCIAVI32] * Set the default debugging channel globally through the main header. CORE-7716
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 22:56:27 2013 New Revision: 61392 URL: http://svn.reactos.org/svn/reactos?rev=61392&view=rev Log: [MCIAVI32] * Set the default debugging channel globally through the main header. CORE-7716 Modified: trunk/reactos/dll/win32/mciavi32/info.c trunk/reactos/dll/win32/mciavi32/mciavi.c trunk/reactos/dll/win32/mciavi32/mmoutput.c trunk/reactos/dll/win32/mciavi32/private_mciavi.h trunk/reactos/dll/win32/mciavi32/wnd.c Modified: trunk/reactos/dll/win32/mciavi32/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/info.c?… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <string.h> #include "private_mciavi.h" -#include <wine/debug.h> -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mciavi); /************************************************************************** * MCIAVI_ConvertFrameToTimeFormat [internal] Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mciavi.… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -37,12 +37,9 @@ * audio is played... still should be stopped ASAP */ -//#include <string.h> #include "private_mciavi.h" -#include <wine/debug.h> + #include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutpu… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -20,9 +20,6 @@ */ #include "private_mciavi.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCKINFO *mmckStream) { Modified: trunk/reactos/dll/win32/mciavi32/private_mciavi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/private… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/private_mciavi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/private_mciavi.h [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -27,14 +27,15 @@ #include <stdarg.h> #include <windef.h> -//#include "winbase.h" #include <wingdi.h> -//#include "winuser.h" #include <mmddk.h> #include <digitalv.h> #include <vfw.h> #include <wownt32.h> #include <mciavi.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mciavi); struct MMIOPos { DWORD dwOffset; Modified: trunk/reactos/dll/win32/mciavi32/wnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/wnd.c?r… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/wnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/wnd.c [iso-8859-1] Tue Dec 24 22:56:27 2013 @@ -19,11 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <string.h> #include "private_mciavi.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0};

1 0

[akhaldi] 61391: [MAPI32] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions that already exist in the ...
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 22:50:09 2013 New Revision: 61391 URL: http://svn.reactos.org/svn/reactos?rev=61391&view=rev Log: [MAPI32] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions that already exist in the main resource file. CORE-7716 Added: trunk/reactos/dll/win32/mapi32/precomp.h (with props) Modified: trunk/reactos/dll/win32/mapi32/imalloc.c trunk/reactos/dll/win32/mapi32/lang/Cy.rc trunk/reactos/dll/win32/mapi32/lang/Da.rc trunk/reactos/dll/win32/mapi32/lang/De.rc trunk/reactos/dll/win32/mapi32/lang/En.rc trunk/reactos/dll/win32/mapi32/lang/Es.rc trunk/reactos/dll/win32/mapi32/lang/Fr.rc trunk/reactos/dll/win32/mapi32/lang/Ga.rc trunk/reactos/dll/win32/mapi32/lang/He.rc trunk/reactos/dll/win32/mapi32/lang/Hu.rc trunk/reactos/dll/win32/mapi32/lang/It.rc trunk/reactos/dll/win32/mapi32/lang/Ja.rc trunk/reactos/dll/win32/mapi32/lang/Ko.rc trunk/reactos/dll/win32/mapi32/lang/Lt.rc trunk/reactos/dll/win32/mapi32/lang/Nl.rc trunk/reactos/dll/win32/mapi32/lang/No.rc trunk/reactos/dll/win32/mapi32/lang/Pl.rc trunk/reactos/dll/win32/mapi32/lang/Pt.rc trunk/reactos/dll/win32/mapi32/lang/Ro.rc trunk/reactos/dll/win32/mapi32/lang/Ru.rc trunk/reactos/dll/win32/mapi32/lang/Si.rc trunk/reactos/dll/win32/mapi32/lang/Uk.rc trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/res.h trunk/reactos/dll/win32/mapi32/sendmail.c trunk/reactos/dll/win32/mapi32/stubs.c trunk/reactos/dll/win32/mapi32/util.c trunk/reactos/dll/win32/mapi32/version.rc Modified: trunk/reactos/dll/win32/mapi32/imalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c… ============================================================================== --- trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -18,28 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -//#include "winuser.h" -//#include "winerror.h" -//#include "winternl.h" -//#include "objbase.h" -//#include "shlwapi.h" -#include <mapiutil.h> -#include "util.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mapi); +#include "precomp.h" static const IMallocVtbl MAPI_IMalloc_vt; Modified: trunk/reactos/dll/win32/mapi32/lang/Cy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Cy.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Cy.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Cy.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - LANGUAGE LANG_WELSH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Da.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Da.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/De.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/De.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/En.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/En.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Es.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Es.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Fr.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Fr.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Ga.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ga.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ga.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ga.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - LANGUAGE LANG_GAELIC, SUBLANG_GAELIC STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/He.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/He.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -21,8 +21,6 @@ * */ -#include "res.h" - LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Hu.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Hu.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/It.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/It.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ja.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ja.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ko.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ko.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Lt.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Lt.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Nl.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Nl.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/No.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/No.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - #pragma code_page(65001) LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/mapi32/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Pl.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Pl.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Pt.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Pt.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - #pragma code_page(65001) LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN Modified: trunk/reactos/dll/win32/mapi32/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ro.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ro.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -18,8 +18,6 @@ * */ -#include "res.h" - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ru.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ru.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Si.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Si.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mapi32/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Uk.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Uk.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -18,24 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "objbase.h" -#include <initguid.h> +#include "precomp.h" + #include <mapix.h> -//#include "mapiform.h" -//#include "mapi.h" -#include <wine/debug.h> -#include "util.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mapi); DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; Added: 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 (added) +++ trunk/reactos/dll/win32/mapi32/precomp.h [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -0,0 +1,30 @@ +#ifndef _MAPI32_PCH_ +#define _MAPI32_PCH_ + +#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <initguid.h> +#include <mapival.h> +#include <mapiutil.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mapi); + +#include "util.h" + +#endif /* _MAPI32_PCH_ */ Propchange: trunk/reactos/dll/win32/mapi32/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -18,26 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -//#include "winerror.h" -//#include "winternl.h" -//#include "objbase.h" +#include "precomp.h" + #include <shlwapi.h> #include <wine/list.h> -#include <wine/debug.h> -#include <wine/unicode.h> -#include <mapival.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mapi); BOOL WINAPI FBadRglpszA(LPSTR*,ULONG); Modified: trunk/reactos/dll/win32/mapi32/res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/res.h?rev… ============================================================================== --- trunk/reactos/dll/win32/mapi32/res.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/res.h [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,7 +19,7 @@ * */ -//#include <windef.h> +#pragma once /* Strings */ #define IDS_NO_MAPI_CLIENT 1 Modified: trunk/reactos/dll/win32/mapi32/sendmail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.… ============================================================================== --- trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,37 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -//#include <stdio.h> -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" +#include "precomp.h" + #include <winuser.h> -//#include "objbase.h" -//#include "objidl.h" -//#include "mapi.h" -//#include "mapix.h" -#include <mapiutil.h> -//#include "mapidefs.h" -//#include "winreg.h" -//#include "shellapi.h" -//#include "shlwapi.h" -#include <wine/debug.h> -#include <wine/unicode.h> -#include "util.h" + #include "res.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mapi); #define READ_BUF_SIZE 4096 Modified: trunk/reactos/dll/win32/mapi32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/stubs.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -1,10 +1,12 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H + #include <stdarg.h> #include <windef.h> #include <winbase.h> #include <mapix.h> + #include <reactos/debug.h> typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK; Modified: trunk/reactos/dll/win32/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,32 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> +#include "precomp.h" + #include <stdio.h> -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -//#include "winuser.h" -//#include "winerror.h" #include <winternl.h> -//#include "objbase.h" #include <shlwapi.h> -#include <wine/debug.h> -#include <wine/unicode.h> -#include <mapival.h> #include <xcmc.h> #include <msi.h> -#include "util.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mapi); static const BYTE digitsToHex[] = { 0,1,2,3,4,5,6,7,8,9,0xff,0xff,0xff,0xff,0xff,0xff,0xff,10,11,12,13,14,15, Modified: trunk/reactos/dll/win32/mapi32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/version.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/version.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -15,6 +15,8 @@ * 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 "res.h" #define WINE_FILEDESCRIPTION_STR "Wine Messaging API" #define WINE_FILENAME_STR "mapi32.dll"

1 0

[hbelusca] 61390: [NTVDM] - BIOS: Fix setting video page parameters when setting mode, and effectively fix setting of video page (fix the involved CRTC registers !!). Now Advanced NetWars works wit...
by hbelusca＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: hbelusca Date: Tue Dec 24 22:40:15 2013 New Revision: 61390 URL: http://svn.reactos.org/svn/reactos?rev=61390&view=rev Log: [NTVDM] - BIOS: Fix setting video page parameters when setting mode, and effectively fix setting of video page (fix the involved CRTC registers !!). Now Advanced NetWars works without flickering. - VGA: Fix code presentation. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/vga.c branches/ntvdm/subsystems/ntvdm/vga.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Dec 24 22:40:15 2013 @@ -254,7 +254,7 @@ }; /* See http://wiki.osdev.org/Drawing_In_Protected_Mode#Locating_Video_Memory */ -static PVGA_REGISTERS VideoModes[] = +static PVGA_REGISTERS VideoModes[BIOS_MAX_VIDEO_MODE + 1] = { &VideoMode_40x25_text, /* Mode 00h */ // 16 color (mono) &VideoMode_40x25_text, /* Mode 01h */ // 16 color @@ -272,10 +272,21 @@ &VideoMode_320x200_16color, /* Mode 0Dh */ // EGA 320*200 16 color &VideoMode_640x200_16color, /* Mode 0Eh */ // EGA 640*200 16 color NULL, /* Mode 0Fh */ // EGA 640*350 mono - &VideoMode_640x350_16color, /* Mode 10h */ // EGA 640*350 16 color + &VideoMode_640x350_16color, /* Mode 10h */ // EGA 640*350 HiRes 16 color &VideoMode_640x480_2color, /* Mode 11h */ // VGA 640*480 mono &VideoMode_640x480_16color, /* Mode 12h */ // VGA &VideoMode_320x200_256color, /* Mode 13h */ // VGA +}; + +// FIXME: Are they computable with the previous data ?? +// Values taken from DosBox +static WORD VideoModePageSize[BIOS_MAX_VIDEO_MODE + 1] = +{ + 0x0800, 0x0800, 0x1000, 0x1000, + 0x4000, 0x4000, 0x4000, 0x1000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x2000, 0x4000, 0x8000, + 0x8000, 0xA000, 0xA000, 0x2000 }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -469,6 +480,8 @@ BOOLEAN BiosSetVideoMode(BYTE ModeNumber) { INT i; + BYTE Page; + COORD Resolution; PVGA_REGISTERS VgaMode = VideoModes[ModeNumber]; @@ -504,12 +517,20 @@ // Bda->CrtModeControl; // Bda->CrtColorPaletteMask; + // Bda->EGAFlags; + // Bda->VGAFlags; /* Update the values in the BDA */ - Bda->VideoMode = ModeNumber; - Bda->VideoPage = 0; - Bda->VideoPageSize = BIOS_PAGE_SIZE; - Bda->VideoPageOffset = 0; + Bda->VideoMode = ModeNumber; + Bda->VideoPageSize = VideoModePageSize[ModeNumber]; + Bda->VideoPage = 0; + Bda->VideoPageOffset = Bda->VideoPage * Bda->VideoPageSize; + + /* Set the start address in the CRTC */ + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_LOW_REG); + VgaWritePort(VGA_CRTC_DATA , LOBYTE(Bda->VideoPageOffset)); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_HIGH_REG); + VgaWritePort(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); /* Get the character height */ VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_MAX_SCAN_LINE_REG); @@ -519,27 +540,39 @@ Bda->ScreenColumns = Resolution.X; Bda->ScreenRows = Resolution.Y - 1; + /* Set cursor position for each page */ + for (Page = 0; Page < BIOS_MAX_PAGES; ++Page) + BiosSetCursorPosition(0, 0, Page); + return TRUE; } BOOLEAN BiosSetVideoPage(BYTE PageNumber) { + BYTE Row, Column; + /* Check if the page exists */ if (PageNumber >= BIOS_MAX_PAGES) return FALSE; /* Check if this is the same page */ if (PageNumber == Bda->VideoPage) return TRUE; - /* Set the values in the BDA */ - Bda->VideoPage = PageNumber; - Bda->VideoPageSize = BIOS_PAGE_SIZE; - Bda->VideoPageOffset = PageNumber * BIOS_PAGE_SIZE; + /* Update the values in the BDA */ + Bda->VideoPage = PageNumber; + Bda->VideoPageOffset = Bda->VideoPage * Bda->VideoPageSize; /* Set the start address in the CRTC */ - VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_LOW_REG); VgaWritePort(VGA_CRTC_DATA , LOBYTE(Bda->VideoPageOffset)); - VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_HIGH_REG); VgaWritePort(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); + + /* + * Get the cursor location (we don't update anything on the BIOS side + * but we update the cursor location on the VGA side). + */ + BiosGetCursorPosition(&Row, &Column, PageNumber); + BiosSetCursorPosition(Row, Column, PageNumber); return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Tue Dec 24 22:40:15 2013 @@ -38,7 +38,6 @@ #define BIOS_DEFAULT_VIDEO_MODE 0x03 #define BIOS_MAX_PAGES 8 -#define BIOS_PAGE_SIZE 0x1000 #define BIOS_MAX_VIDEO_MODE 0x13 #define DEFAULT_ATTRIBUTE 0x07 Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Tue Dec 24 22:40:15 2013 @@ -645,8 +645,8 @@ INT i, j, k; COORD Resolution = VgaGetDisplayResolution(); INT AddressSize = VgaGetAddressSize(); - DWORD Address = (VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG] << 8) - + VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG]; + DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], + VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]); DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; /* Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Tue Dec 24 22:40:15 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: vga.h - * PURPOSE: VGA hardware emulation (header file) + * PURPOSE: VGA hardware emulation * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
31
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2013