Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[akhaldi] 61379: [USBUHCI] * Move some inclusions and definitions to the main header. * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 24 20:54:29 2013 New Revision: 61379 URL: http://svn.reactos.org/svn/reactos?rev=61379&view=rev Log: [USBUHCI] * Move some inclusions and definitions to the main header. * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp trunk/reactos/drivers/usb/usbuhci/usbuhci.h Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Tue Dec 24 20:54:29 2013 @@ -8,9 +8,10 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ -#define INITGUID #include "usbuhci.h" -#include "hardware.h" + +#define NDEBUG +#include <debug.h> typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext); Modified: trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] Tue Dec 24 20:54:29 2013 @@ -9,7 +9,9 @@ */ #include "usbuhci.h" -#include "hardware.h" + +#define NDEBUG +#include <debug.h> class CUSBQueue : public IUHCIQueue { Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Tue Dec 24 20:54:29 2013 @@ -8,10 +8,10 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ -#define INITGUID - #include "usbuhci.h" -#include "hardware.h" + +#define NDEBUG +#include <debug.h> class CUSBRequest : public IUHCIRequest { Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp [iso-8859-1] Tue Dec 24 20:54:29 2013 @@ -9,6 +9,9 @@ */ #include "usbuhci.h" + +#define NDEBUG +#include <debug.h> extern "C" Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] Tue Dec 24 20:54:29 2013 @@ -1,9 +1,9 @@ #ifndef USBUHCI_H__ #define USBUHCI_H__ +#define INITGUID + #include <ntddk.h> -#define NDEBUG -#include <debug.h> #include <hubbusif.h> #include <usbbusif.h> #include <usbioctl.h> @@ -30,6 +30,7 @@ #include <dmusicks.h> #include <kcom.h> +#include "hardware.h" #include "interfaces.h" //

11 years

[akhaldi] 61378: [HNETCFG] * 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...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 24 20:45:58 2013 New Revision: 61378 URL: http://svn.reactos.org/svn/reactos?rev=61378&view=rev Log: [HNETCFG] * 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/hnetcfg/apps.c trunk/reactos/dll/win32/hnetcfg/hnetcfg.c trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h trunk/reactos/dll/win32/hnetcfg/manager.c trunk/reactos/dll/win32/hnetcfg/policy.c trunk/reactos/dll/win32/hnetcfg/port.c trunk/reactos/dll/win32/hnetcfg/profile.c trunk/reactos/dll/win32/hnetcfg/service.c Modified: trunk/reactos/dll/win32/hnetcfg/apps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/apps.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] Tue Dec 24 20:45:58 2013 @@ -16,27 +16,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 <config.h> -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" +#include "hnetcfg_private.h" + +#include <winnls.h> #include <ole2.h> -#include <netfw.h> - -#include <wine/debug.h> -#include <wine/unicode.h> -#include "hnetcfg_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_app { Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] Tue Dec 24 20:45:58 2013 @@ -16,24 +16,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> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <rpcproxy.h> -#include <netfw.h> - -#include <wine/debug.h> #include "hnetcfg_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); +#include <rpcproxy.h> static HINSTANCE instance; 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] Tue Dec 24 20:45:58 2013 @@ -15,6 +15,26 @@ * 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 <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <initguid.h> + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <netfw.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); enum type_id { Modified: trunk/reactos/dll/win32/hnetcfg/manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/manager.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/manager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/manager.c [iso-8859-1] Tue Dec 24 20:45:58 2013 @@ -16,28 +16,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 <config.h> -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "initguid.h" -#include <ole2.h> -#include <netfw.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" #include "hnetcfg_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_manager { Modified: trunk/reactos/dll/win32/hnetcfg/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/policy.c… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/policy.c [iso-8859-1] Tue Dec 24 20:45:58 2013 @@ -16,27 +16,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 <config.h> -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <netfw.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" #include "hnetcfg_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_policy { Modified: trunk/reactos/dll/win32/hnetcfg/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/port.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/port.c [iso-8859-1] Tue Dec 24 20:45:58 2013 @@ -16,27 +16,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 <config.h> -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <netfw.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" #include "hnetcfg_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_port { Modified: trunk/reactos/dll/win32/hnetcfg/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/profile.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/profile.c [iso-8859-1] Tue Dec 24 20:45:58 2013 @@ -16,27 +16,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 <config.h> -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <netfw.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" #include "hnetcfg_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_profile { Modified: trunk/reactos/dll/win32/hnetcfg/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/service.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/service.c [iso-8859-1] Tue Dec 24 20:45:58 2013 @@ -16,27 +16,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 <config.h> -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <netfw.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" #include "hnetcfg_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_service {

11 years

[akhaldi] 61377: [USBOHCI] * Move some inclusions and definitions to the main header. * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 24 20:42:53 2013 New Revision: 61377 URL: http://svn.reactos.org/svn/reactos?rev=61377&view=rev Log: [USBOHCI] * Move some inclusions and definitions to the main header. * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp trunk/reactos/drivers/usb/usbohci/usb_queue.cpp trunk/reactos/drivers/usb/usbohci/usb_request.cpp trunk/reactos/drivers/usb/usbohci/usbohci.cpp trunk/reactos/drivers/usb/usbohci/usbohci.h Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Tue Dec 24 20:42:53 2013 @@ -8,9 +8,10 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ -#define INITGUID #include "usbohci.h" -#include "hardware.h" + +#define NDEBUG +#include <debug.h> typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext); Modified: trunk/reactos/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Tue Dec 24 20:42:53 2013 @@ -9,7 +9,9 @@ */ #include "usbohci.h" -#include "hardware.h" + +#define NDEBUG +#include <debug.h> class CUSBQueue : public IOHCIQueue { Modified: trunk/reactos/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Tue Dec 24 20:42:53 2013 @@ -8,10 +8,10 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ -#define INITGUID - #include "usbohci.h" -#include "hardware.h" + +#define NDEBUG +#include <debug.h> class CUSBRequest : public IOHCIRequest { Modified: trunk/reactos/drivers/usb/usbohci/usbohci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usbohc… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usbohci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usbohci.cpp [iso-8859-1] Tue Dec 24 20:42:53 2013 @@ -9,6 +9,9 @@ */ #include "usbohci.h" + +#define NDEBUG +#include <debug.h> extern "C" Modified: trunk/reactos/drivers/usb/usbohci/usbohci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usbohc… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usbohci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usbohci.h [iso-8859-1] Tue Dec 24 20:42:53 2013 @@ -1,9 +1,9 @@ #ifndef USBOHCI_H__ #define USBOHCI_H__ +#define INITGUID + #include <ntddk.h> -#define NDEBUG -#include <debug.h> #include <hubbusif.h> #include <usbbusif.h> #include <usbioctl.h> @@ -31,6 +31,7 @@ #include <dmusicks.h> #include <kcom.h> +#include "hardware.h" #include "interfaces.h" //

11 years

[akhaldi] 61376: [LOCALSPL] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Set...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 24 20:40:55 2013 New Revision: 61376 URL: http://svn.reactos.org/svn/reactos?rev=61376&view=rev Log: [LOCALSPL] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * 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/localspl/resource.h (with props) Modified: trunk/reactos/dll/win32/localspl/lang/spl_Cy.rc trunk/reactos/dll/win32/localspl/lang/spl_Da.rc trunk/reactos/dll/win32/localspl/lang/spl_De.rc trunk/reactos/dll/win32/localspl/lang/spl_En.rc trunk/reactos/dll/win32/localspl/lang/spl_Es.rc trunk/reactos/dll/win32/localspl/lang/spl_Fr.rc trunk/reactos/dll/win32/localspl/lang/spl_He.rc trunk/reactos/dll/win32/localspl/lang/spl_Hu.rc trunk/reactos/dll/win32/localspl/lang/spl_It.rc trunk/reactos/dll/win32/localspl/lang/spl_Ja.rc trunk/reactos/dll/win32/localspl/lang/spl_Ko.rc trunk/reactos/dll/win32/localspl/lang/spl_Lt.rc trunk/reactos/dll/win32/localspl/lang/spl_Nl.rc trunk/reactos/dll/win32/localspl/lang/spl_No.rc trunk/reactos/dll/win32/localspl/lang/spl_Pl.rc trunk/reactos/dll/win32/localspl/lang/spl_Pt.rc trunk/reactos/dll/win32/localspl/lang/spl_Ro.rc trunk/reactos/dll/win32/localspl/lang/spl_Ru.rc trunk/reactos/dll/win32/localspl/lang/spl_Si.rc trunk/reactos/dll/win32/localspl/lang/spl_Sv.rc trunk/reactos/dll/win32/localspl/lang/spl_Uk.rc trunk/reactos/dll/win32/localspl/lang/spl_Zh.rc trunk/reactos/dll/win32/localspl/localmon.c trunk/reactos/dll/win32/localspl/localspl.rc trunk/reactos/dll/win32/localspl/localspl_main.c trunk/reactos/dll/win32/localspl/localspl_private.h trunk/reactos/dll/win32/localspl/provider.c Modified: trunk/reactos/dll/win32/localspl/lang/spl_Cy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Cy.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Cy.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_WELSH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Da.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_De.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localspl/lang/spl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_En.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Es.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/localspl/lang/spl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Fr.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_He.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Hu.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/localspl/lang/spl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_It.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/localspl/lang/spl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Ja.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/localspl/lang/spl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Ko.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Lt.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/localspl/lang/spl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Nl.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_No.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Pl.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Pt.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Ro.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - #pragma code_page(65001) LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localspl/lang/spl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Ru.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/localspl/lang/spl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Si.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localspl/lang/spl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Sv.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/localspl/lang/spl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Uk.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/localspl/lang/spl_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/sp… ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Zh.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "localspl_private.h" - /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/localspl/localmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localmo… ============================================================================== --- trunk/reactos/dll/win32/localspl/localmon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localmon.c [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,29 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <winreg.h> - -#include <winspool.h> -#include <ddk/winsplp.h> #include "localspl_private.h" - -#include <wine/debug.h> -#include <wine/list.h> -#include <wine/unicode.h> - - -WINE_DEFAULT_DEBUG_CHANNEL(localspl); /*****************************************************/ Modified: trunk/reactos/dll/win32/localspl/localspl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… ============================================================================== --- trunk/reactos/dll/win32/localspl/localspl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localspl.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -19,10 +19,7 @@ * */ -//#include "windef.h" -//#include "winbase.h" -//#include "winver.h" -//#include "localspl_private.h" +#include "resource.h" #define WINE_FILENAME_STR "localspl.dll" #define WINE_FILEDESCRIPTION_STR "Wine Printer spooler component" Modified: trunk/reactos/dll/win32/localspl/localspl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… ============================================================================== --- trunk/reactos/dll/win32/localspl/localspl_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localspl_main.c [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> - -#include <wine/debug.h> #include "localspl_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(localspl); - HINSTANCE LOCALSPL_hInstance = NULL; Modified: trunk/reactos/dll/win32/localspl/localspl_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localsp… ============================================================================== --- trunk/reactos/dll/win32/localspl/localspl_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localspl_private.h [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -21,19 +21,34 @@ #ifndef __WINE_LOCALSPL_PRIVATE__ #define __WINE_LOCALSPL_PRIVATE__ -//#include <windef.h> +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <winreg.h> +#include <winspool.h> + +#include <wine/list.h> +#include <wine/unicode.h> +#include <ddk/winsplp.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(localspl); + +#include "resource.h" /* ## DLL-wide Globals ## */ extern HINSTANCE LOCALSPL_hInstance DECLSPEC_HIDDEN; void setup_provider(void) DECLSPEC_HIDDEN; - -/* ## Resource-ID ## */ -#define IDS_LOCALPORT 500 -#define IDS_LOCALMONITOR 507 - -/* ## Reserved memorysize for the strings (in WCHAR) ## */ -#define IDS_LOCALMONITOR_MAXLEN 64 -#define IDS_LOCALPORT_MAXLEN 32 /* ## Type of Ports ## */ /* windows types */ Modified: trunk/reactos/dll/win32/localspl/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide… ============================================================================== --- trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,28 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winreg.h> -#include <winspool.h> -#include <winuser.h> +#include "localspl_private.h" + #include <ddk/winddiui.h> -#include <ddk/winsplp.h> - -#include <wine/list.h> -#include <wine/debug.h> -#include <wine/unicode.h> -#include "localspl_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(localspl); /* ############################### */ Added: trunk/reactos/dll/win32/localspl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/resourc… ============================================================================== --- trunk/reactos/dll/win32/localspl/resource.h (added) +++ trunk/reactos/dll/win32/localspl/resource.h [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -0,0 +1,9 @@ +#pragma once + +/* ## Resource-ID ## */ +#define IDS_LOCALPORT 500 +#define IDS_LOCALMONITOR 507 + +/* ## Reserved memorysize for the strings (in WCHAR) ## */ +#define IDS_LOCALMONITOR_MAXLEN 64 +#define IDS_LOCALPORT_MAXLEN 32 Propchange: trunk/reactos/dll/win32/localspl/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

11 years

[hbelusca] 61375: [NTVDM]: We know that .h files are header files ; )

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 24 15:53:30 2013 New Revision: 61375 URL: http://svn.reactos.org/svn/reactos?rev=61375&view=rev Log: [NTVDM]: We know that .h files are header files ;) Modified: branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ps2.h 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 15:53:30 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: bios.h - * PURPOSE: VDM BIOS (header file) + * PURPOSE: VDM BIOS * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Tue Dec 24 15:53:30 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: dos.h - * PURPOSE: VDM DOS Kernel (header file) + * PURPOSE: VDM DOS Kernel * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Tue Dec 24 15:53:30 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: emulator.h - * PURPOSE: Minimal x86 machine emulator for the VDM (header file) + * PURPOSE: Minimal x86 machine emulator for the VDM * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ Modified: branches/ntvdm/subsystems/ntvdm/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] Tue Dec 24 15:53:30 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: ps2.h - * PURPOSE: PS/2 controller emulation (header file) + * PURPOSE: PS/2 controller emulation * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */

11 years

[hbelusca] 61374: [NTVDM]: Implement and export VDDTerminateVDM.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 24 15:52:31 2013 New Revision: 61374 URL: http://svn.reactos.org/svn/reactos?rev=61374&view=rev Log: [NTVDM]: Implement and export VDDTerminateVDM. Modified: branches/ntvdm/include/ddk/nt_vdd.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/ntvdm.spec Modified: branches/ntvdm/include/ddk/nt_vdd.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/nt_vdd.h?rev=… ============================================================================== --- branches/ntvdm/include/ddk/nt_vdd.h [iso-8859-1] (original) +++ branches/ntvdm/include/ddk/nt_vdd.h [iso-8859-1] Tue Dec 24 15:52:31 2013 @@ -27,6 +27,14 @@ #ifdef __cplusplus extern "C" { #endif + +/* + * VDM Control + */ + +VOID +WINAPI +VDDTerminateVDM(VOID); /* * I/O Port services Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Dec 24 15:52:31 2013 @@ -2572,6 +2572,7 @@ { UNREFERENCED_PARAMETER(Stack); + /* Stop the VDM */ VdmRunning = FALSE; } Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Tue Dec 24 15:52:31 2013 @@ -181,6 +181,14 @@ +VOID +WINAPI +VDDTerminateVDM(VOID) +{ + /* Stop the VDM */ + VdmRunning = FALSE; +} + PBYTE WINAPI Sim32pGetVDMPointer(IN ULONG Address, Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.sp… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.spec [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.spec [iso-8859-1] Tue Dec 24 15:52:31 2013 @@ -185,3 +185,5 @@ @ stdcall call_ica_hw_interrupt(long long long) @ stdcall VDDInstallIOHook(long long ptr ptr) @ stdcall VDDDeInstallIOHook(long long ptr) + +@ stdcall VDDTerminateVDM()

11 years

[hbelusca] 61373: [DDK] - Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 24 15:50:31 2013 New Revision: 61373 URL: http://svn.reactos.org/svn/reactos?rev=61373&view=rev Log: [DDK] - Code formatting only. Modified: branches/ntvdm/include/ddk/vddsvc.h Modified: branches/ntvdm/include/ddk/vddsvc.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/vddsvc.h?rev=… ============================================================================== --- branches/ntvdm/include/ddk/vddsvc.h [iso-8859-1] (original) +++ branches/ntvdm/include/ddk/vddsvc.h [iso-8859-1] Tue Dec 24 15:50:31 2013 @@ -34,9 +34,12 @@ VOID WINAPI -call_ica_hw_interrupt(INT ms, - BYTE line, - INT count); +call_ica_hw_interrupt +( + INT ms, + BYTE line, + INT count +); #define VDDSimulateInterrupt(ms, line, count) \ call_ica_hw_interrupt((ms), (line), (count)) // Windows specifies a count of 1 ...

11 years

[hbelusca] 61372: [NTVDM] Implement and export (and define in vddsvc.h) call_ica_hw_interrupt and VDDSimulateInterrupt macro. ICA = Interrupt Controller Adapter (in windows terminology)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 24 15:30:59 2013 New Revision: 61372 URL: http://svn.reactos.org/svn/reactos?rev=61372&view=rev Log: [NTVDM] Implement and export (and define in vddsvc.h) call_ica_hw_interrupt and VDDSimulateInterrupt macro. ICA = Interrupt Controller Adapter (in windows terminology) Modified: branches/ntvdm/include/ddk/vddsvc.h branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/ntvdm.spec branches/ntvdm/subsystems/ntvdm/pic.c branches/ntvdm/subsystems/ntvdm/pic.h Modified: branches/ntvdm/include/ddk/vddsvc.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/vddsvc.h?rev=… ============================================================================== --- branches/ntvdm/include/ddk/vddsvc.h [iso-8859-1] (original) +++ branches/ntvdm/include/ddk/vddsvc.h [iso-8859-1] Tue Dec 24 15:30:59 2013 @@ -25,6 +25,22 @@ #ifndef _NT_VDD #include <nt_vdd.h> #endif + +/* + * Interrupts services + */ +#define ICA_MASTER 0 +#define ICA_SLAVE 1 + +VOID +WINAPI +call_ica_hw_interrupt(INT ms, + BYTE line, + INT count); + +#define VDDSimulateInterrupt(ms, line, count) \ + call_ica_hw_interrupt((ms), (line), (count)) // Windows specifies a count of 1 ... + /* * Registers manipulation Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Tue Dec 24 15:30:59 2013 @@ -24,7 +24,7 @@ #include <winreg.h> #include <winuser.h> -#include <nt_vdd.h> +#include <vddsvc.h> #include <debug.h> Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.sp… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.spec [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.spec [iso-8859-1] Tue Dec 24 15:30:59 2013 @@ -175,8 +175,6 @@ - - @ stdcall MGetVdmPointer(long long long) @ stdcall Sim32pGetVDMPointer(long long) @@ -184,5 +182,6 @@ @ stdcall VdmMapFlat(long long long) ;@ stdcall VdmUnmapFlat(long long ptr long) ; Not exported on x86 +@ stdcall call_ica_hw_interrupt(long long long) @ stdcall VDDInstallIOHook(long long ptr ptr) @ stdcall VDDDeInstallIOHook(long long ptr) Modified: branches/ntvdm/subsystems/ntvdm/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] Tue Dec 24 15:30:59 2013 @@ -3,6 +3,7 @@ * PROJECT: ReactOS Virtual DOS Machine * FILE: pic.c * PURPOSE: Programmable Interrupt Controller emulation + * (Interrupt Controller Adapter (ICA) in Windows terminology) * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ @@ -200,7 +201,7 @@ if (Number >= 0 && Number < 8) { /* Check if any of the higher-priority interrupts are busy */ - for (i = 0; i <= Number ; i++) + for (i = 0; i <= Number; i++) { if (MasterPic.InServiceRegister & (1 << Number)) return; } @@ -301,4 +302,41 @@ return TRUE; } + + +VOID +WINAPI +call_ica_hw_interrupt(INT ms, + BYTE line, + INT count) +{ + BYTE InterruptNumber = line; + + /* Check for PIC validity */ + if (ms != ICA_MASTER || ms != ICA_SLAVE) return; + + /* + * Adjust the interrupt request number according to the parameters, + * by adding an offset == 8 to the interrupt number. + * + * Indeed VDDs calling this function usually subtracts 8 so that they give: + * + * ms | line | corresponding interrupt number + * ------------+--------+-------------------------------- + * ICA_MASTER | 0 -- 7 | 0 -- 7 + * ICA_SLAVE | 0 -- 7 | 8 -- 15 + * + * and PicInterruptRequest subtracts again 8 to the interrupt number + * if it is greater or equal than 8 (so that it determines which PIC + * to use via the interrupt number). + */ + if (ms == ICA_SLAVE) InterruptNumber += 8; + + /* Send the specified number of interrupt requests */ + while (count-- > 0) + { + PicInterruptRequest(InterruptNumber); + } +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/pic.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] Tue Dec 24 15:30:59 2013 @@ -2,7 +2,8 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: pic.h - * PURPOSE: Programmable Interrupt Controller emulation (header file) + * PURPOSE: Programmable Interrupt Controller emulation + * (Interrupt Controller Adapter (ICA) in Windows terminology) * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */

11 years

[hbelusca] 61371: Oups, forgot to link against advapi32 too (for registry functions) xD

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 24 13:48:39 2013 New Revision: 61371 URL: http://svn.reactos.org/svn/reactos?rev=61371&view=rev Log: Oups, forgot to link against advapi32 too (for registry functions) xD Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Tue Dec 24 13:48:39 2013 @@ -25,5 +25,5 @@ add_executable(ntvdm ${SOURCE}) set_module_type(ntvdm win32cui UNICODE) target_link_libraries(ntvdm fast486) -add_importlibs(ntvdm msvcrt user32 gdi32 kernel32 ntdll) +add_importlibs(ntvdm user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all)

11 years

[hbelusca] 61370: [NTVDM] Load VDDs registered in HKLM\SYSTEM\CurrentControlSet\Control\VirtualDeviceDrivers key, value "VDD" (of type REG_MULTI_SZ). I still don't call FreeLibrary to unload them a...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 24 13:33:51 2013 New Revision: 61370 URL: http://svn.reactos.org/svn/reactos?rev=61370&view=rev Log: [NTVDM] Load VDDs registered in HKLM\SYSTEM\CurrentControlSet\Control\VirtualDeviceDrivers key, value "VDD" (of type REG_MULTI_SZ). I still don't call FreeLibrary to unload them at the end of NTVDM's lifetime (otherwise we would have to store their handles in an array). Modified: branches/ntvdm/subsystems/ntvdm/vddsup.c Modified: branches/ntvdm/subsystems/ntvdm/vddsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vddsup.c… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vddsup.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vddsup.c [iso-8859-1] Tue Dec 24 13:33:51 2013 @@ -16,6 +16,8 @@ #include "bop.h" #include "registers.h" +#include <isvbop.h> + typedef VOID (WINAPI *VDD_PROC)(VOID); typedef struct _VDD_MODULE @@ -24,13 +26,10 @@ VDD_PROC DispatchRoutine; } VDD_MODULE, *PVDD_MODULE; -/* BOP Identifiers */ -#define BOP_3RDPARTY 0x58 // 3rd-party VDD BOP - /* PRIVATE VARIABLES **********************************************************/ // TODO: Maybe use a linked list. -// But the number of elements must be <= MAXUSHORT +// But the number of elements must be <= MAXUSHORT (MAXWORD) #define MAX_VDD_MODULES 0xFF + 1 VDD_MODULE VDDList[MAX_VDD_MODULES] = {{NULL}}; @@ -77,11 +76,21 @@ /* Clear the Carry Flag (no error happened so far) */ setCF(0); + /* Retrieve the next free entry in the table (used later on) */ + Entry = GetNextFreeVDDEntry(); + if (Entry >= MAX_VDD_MODULES) + { + DPRINT1("Failed to create a new VDD module entry\n"); + Success = FALSE; + RetVal = 4; + goto Quit; + } + /* Retrieve the VDD name in DS:SI */ DllName = (LPCSTR)SEG_OFF_TO_PTR(getDS(), getSI()); /* Retrieve the initialization routine API name in ES:DI (optional --> ES=DI=0) */ - if (getES() != 0 || getDI() != 0) + if (TO_LINEAR(getES(), getDI()) != 0) InitRoutineName = (LPCSTR)SEG_OFF_TO_PTR(getES(), getDI()); /* Retrieve the dispatch routine API name in DS:BX */ @@ -139,14 +148,6 @@ /* If we arrived there, that means everything is OK */ /* Register the VDD DLL */ - Entry = GetNextFreeVDDEntry(); - if (Entry == MAX_VDD_MODULES) - { - DPRINT1("Failed to create a new VDD module entry\n"); - Success = FALSE; - RetVal = 4; - goto Quit; - } VDDList[Entry].hDll = hDll; VDDList[Entry].DispatchRoutine = DispatchRoutine; @@ -232,12 +233,110 @@ } } +BOOL LoadInstallableVDD(VOID) +{ +#define ERROR_MEMORYVDD L"Insufficient memory to load installable Virtual Device Drivers." +#define ERROR_REGVDD L"Virtual Device Driver format in the registry is invalid." +#define ERROR_LOADVDD L"An installable Virtual Device Driver failed Dll initialization." + + BOOL Success = TRUE; + LONG Error = 0; + DWORD Type = 0; + DWORD BufSize = 0; + + HKEY hVDDKey; + LPCWSTR VDDKeyName = L"SYSTEM\\CurrentControlSet\\Control\\VirtualDeviceDrivers"; + LPWSTR VDDValueName = L"VDD"; + LPWSTR VDDList = NULL; + + HANDLE hVDD; + + /* Open the VDD registry key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + VDDKeyName, + 0, + KEY_QUERY_VALUE, + &hVDDKey) != ERROR_SUCCESS) + { + DisplayMessage(ERROR_REGVDD); + return FALSE; + } + + /* + * Retrieve the size of the VDD registry value + * and check that it's of REG_MULTI_SZ type. + */ + Error = RegQueryValueExW(hVDDKey, + VDDValueName, + NULL, + &Type, + NULL, + &BufSize); + if (Error != ERROR_SUCCESS || Type != REG_MULTI_SZ) + { + DisplayMessage(ERROR_REGVDD); + Success = FALSE; + goto Quit; + } + + /* Allocate the buffer */ + BufSize = (BufSize < 2*sizeof(WCHAR) ? 2*sizeof(WCHAR) : BufSize); + VDDList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BufSize); + if (VDDList == NULL) + { + DisplayMessage(ERROR_MEMORYVDD); + Success = FALSE; + goto Quit; + } + + /* Retrieve the list of VDDs to load */ + if (RegQueryValueExW(hVDDKey, + VDDValueName, + NULL, + NULL, + (LPBYTE)VDDList, + &BufSize) != ERROR_SUCCESS) + { + DisplayMessage(ERROR_REGVDD); + Success = FALSE; + goto Quit; + } + + /* Load the VDDs */ + VDDValueName = VDDList; + while (*VDDList) + { + DPRINT1("Loading VDD '%S'...", VDDList); + hVDD = LoadLibraryW(VDDList); + if (hVDD == NULL) + { + DbgPrint("Failed\n"); + DisplayMessage(ERROR_LOADVDD); + } + else + { + DbgPrint("Succeeded\n"); + } + /* Go to next string */ + VDDList += wcslen(VDDList) + 1; + } + VDDList = VDDValueName; + +Quit: + if (VDDList) HeapFree(GetProcessHeap(), 0, VDDList); + RegCloseKey(hVDDKey); + return Success; +} + /* PUBLIC FUNCTIONS ***********************************************************/ VOID VDDSupInitialize(VOID) { /* Register the 3rd-party VDD BOP Handler */ RegisterBop(BOP_3RDPARTY, ThirdPartyVDDBop); + + /* Load the installable VDDs from the registry */ + LoadInstallableVDD(); } /* EOF */

11 years

← Newer
1
...
7
8
9
10
11
12
13
...
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