Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[mbosma] 18829: Implement some DirectDraw related COM-Interfaces.
by mbosma＠svn.reactos.com 28 Oct '05

28 Oct '05

Implement some DirectDraw related COM-Interfaces. Modified: trunk/reactos/w32api/include/ddk/dvp.h _____ Modified: trunk/reactos/w32api/include/ddk/dvp.h --- trunk/reactos/w32api/include/ddk/dvp.h 2005-10-28 10:22:24 UTC (rev 18828) +++ trunk/reactos/w32api/include/ddk/dvp.h 2005-10-28 12:09:22 UTC (rev 18829) @@ -1,5 +1,5 @@ -/* $Id: $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -207,4 +207,61 @@ typedef struct _DDVIDEOPORTSTATUS *LPDDVIDEOPORTSTATUS; typedef struct _DDVIDEOPORTNOTIFY *LPDDVIDEOPORTNOTIFY; -#endif +typedef struct IDirectDrawVideoPort* LPDIRECTDRAWVIDEOPORT; +typedef struct IDDVideoPortContainer* LPDDVIDEOPORTCONTAINER; + +typedef HRESULT (FAR PASCAL * LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID); + +#if !defined (_NO_COM) && defined (_WIN32) + +#undef INTERFACE +#define INTERFACE IDDVideoPortContainer +DECLARE_INTERFACE_ (IDDVideoPortContainer, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(CreateVideoPort)(THIS_ DWORD, LPDDVIDEOPORTDESC, LPDIRECTDRAWVIDEOPORT*, IUnknown*) PURE; + STDMETHOD(EnumVideoPorts) (THIS_ DWORD, LPDDVIDEOPORTCAPS, LPVOID, LPDDENUMVIDEOCALLBACK) PURE; + STDMETHOD(GetVideoPortConnectInfo) (THIS_ DWORD, LPDWORD, LPDDVIDEOPORTCONNECT) PURE; + STDMETHOD(QueryVideoPortStatus) (THIS_ DWORD, LPDDVIDEOPORTSTATUS) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDirectDrawVideoPort +DECLARE_INTERFACE_ (IDirectDrawVideoPort, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE; + STDMETHOD(GetBandwidthInfo)(THIS_ LPDDPIXELFORMAT, DWORD, DWORD, DWORD, LPDDVIDEOPORTBANDWIDTH) PURE; + STDMETHOD(GetColorControls) (THIS_ LPDDCOLORCONTROL) PURE; + STDMETHOD(GetInputFormats)(THIS_ LPDWORD, LPDDPIXELFORMAT, DWORD) PURE; + STDMETHOD(GetOutputFormats)(THIS_ LPDDPIXELFORMAT, LPDWORD, LPDDPIXELFORMAT, DWORD) PURE; + STDMETHOD(GetFieldPolarity) (THIS_ LPBOOL) PURE; + STDMETHOD(GetVideoLine) (THIS_ LPDWORD) PURE; + STDMETHOD(GetVideoSignalStatus) (THIS_ LPDWORD) PURE; + STDMETHOD(SetColorControls) (THIS_ LPDDCOLORCONTROL) PURE; + STDMETHOD(SetTargetSurface) (THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE; + STDMETHOD(StartVideo) (THIS_ LPDDVIDEOPORTINFO) PURE; + STDMETHOD(StopVideo) (THIS) PURE; + STDMETHOD(UpdateVideo) (THIS_ LPDDVIDEOPORTINFO) PURE; + STDMETHOD(WaitForSync) (THIS_ DWORD, DWORD, DWORD) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDirectDrawVideoPortNotify +DECLARE_INTERFACE_( IDirectDrawVideoPortNotify, IUnknown ) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(AcquireNotification) (THIS_ HANDLE*, LPDDVIDEOPORTNOTIFY) PURE; + STDMETHOD(ReleaseNotification) (THIS_ HANDLE) PURE; +}; + +#undef INTERFACE + +#endif // !defined (_NO_COM) && defined (_WIN32) +#endif // __DVP_INCLUDED__

1 0

[mbosma] 18828: Dick Buitelaar: Fix DevCpp Backend (Bug 802)
by mbosma＠svn.reactos.com 28 Oct '05

28 Oct '05

Dick Buitelaar: Fix DevCpp Backend (Bug 802) Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-10-28 09:49:45 UTC (rev 18827) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-10-28 10:22:24 UTC (rev 18828) @@ -152,7 +152,7 @@ void DevCppBackend::ProcessFile(string &filepath) { // Remove the .\ at the start of the filenames - filepath.erase(0, 2); + if ((filepath[0] == '.') && (filepath[1] == '\\')) filepath.erase(0, 2); if(!FileExists(filepath)) return;

1 0

[weiden] 18827: fixed uninitialized variable warning
by weiden＠svn.reactos.com 28 Oct '05

28 Oct '05

fixed uninitialized variable warning Modified: trunk/reactos/drivers/dd/green/keyboard.c Property changes on: trunk/reactos/drivers/dd/green ___________________________________________________________________ Name: svn:ignore + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile _____ Modified: trunk/reactos/drivers/dd/green/keyboard.c --- trunk/reactos/drivers/dd/green/keyboard.c 2005-10-28 07:49:16 UTC (rev 18826) +++ trunk/reactos/drivers/dd/green/keyboard.c 2005-10-28 09:49:45 UTC (rev 18827) @@ -178,7 +178,7 @@ KIRQL OldIrql; ULONG i, Queue; ULONG SpaceInQueue; - ULONG BytesConsumed; + ULONG BytesConsumed = 0; PKEYBOARD_INPUT_DATA Input; NTSTATUS Status;

1 0

[hpoussin] 18826: STDCALL -> NTAPI
by hpoussin＠svn.reactos.com 28 Oct '05

28 Oct '05

STDCALL -> NTAPI Update headers to minimize differences between GCC and MSVC Move the #include <debug.h> to each file to be able to use precompiled headers Remove $Id tags Modified: trunk/reactos/drivers/dd/green/createclose.c Modified: trunk/reactos/drivers/dd/green/dispatch.c Modified: trunk/reactos/drivers/dd/green/green.c Modified: trunk/reactos/drivers/dd/green/green.h Modified: trunk/reactos/drivers/dd/green/keyboard.c Modified: trunk/reactos/drivers/dd/green/misc.c Modified: trunk/reactos/drivers/dd/green/pnp.c Modified: trunk/reactos/drivers/dd/green/screen.c _____ Modified: trunk/reactos/drivers/dd/green/createclose.c --- trunk/reactos/drivers/dd/green/createclose.c 2005-10-28 07:04:05 UTC (rev 18825) +++ trunk/reactos/drivers/dd/green/createclose.c 2005-10-28 07:49:16 UTC (rev 18826) @@ -1,17 +1,18 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VT100 emulator * FILE: drivers/dd/green/createclose.c * PURPOSE: IRP_MJ_CREATE, IRP_MJ_CLOSE and IRP_MJ_CLEANUP operations * - * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ //#define NDEBUG +#include <debug.h> + #include "green.h" -NTSTATUS STDCALL +NTSTATUS NTAPI GreenCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -24,7 +25,7 @@ return STATUS_SUCCESS; } -NTSTATUS STDCALL +NTSTATUS NTAPI GreenClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) _____ Modified: trunk/reactos/drivers/dd/green/dispatch.c --- trunk/reactos/drivers/dd/green/dispatch.c 2005-10-28 07:04:05 UTC (rev 18825) +++ trunk/reactos/drivers/dd/green/dispatch.c 2005-10-28 07:49:16 UTC (rev 18826) @@ -1,17 +1,18 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VT100 emulator * FILE: drivers/dd/green/dispatch.c * PURPOSE: Dispatch routines * - * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG +#include <debug.h> + #include "green.h" -NTSTATUS STDCALL +NTSTATUS NTAPI GreenDispatch( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) _____ Modified: trunk/reactos/drivers/dd/green/green.c --- trunk/reactos/drivers/dd/green/green.c 2005-10-28 07:04:05 UTC (rev 18825) +++ trunk/reactos/drivers/dd/green/green.c 2005-10-28 07:49:16 UTC (rev 18826) @@ -1,17 +1,18 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VT100 emulator * FILE: drivers/dd/green/green.c * PURPOSE: Driver entry point * - * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ //#define NDEBUG +#include <debug.h> + #include "green.h" -VOID STDCALL +VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) { // nothing to do here yet @@ -20,7 +21,7 @@ /* * Standard DriverEntry method. */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) _____ Modified: trunk/reactos/drivers/dd/green/green.h --- trunk/reactos/drivers/dd/green/green.h 2005-10-28 07:04:05 UTC (rev 18825) +++ trunk/reactos/drivers/dd/green/green.h 2005-10-28 07:49:16 UTC (rev 18826) @@ -1,24 +1,15 @@ +#include <ntddk.h> +#include <ntddser.h> +#include <kbdmou.h> +#include <stdarg.h> + #if defined(__GNUC__) - #include <ddk/ntddk.h> - #include <ddk/ntddser.h> #include <wincon.h> #include <drivers/blue/ntddblue.h> - #include <ddk/ntddkbd.h> /* should be in kbdmou.h */ - #include <winbase.h> - #include <debug.h> + #define INFINITE 0xFFFFFFFF - /* FIXME: should be in kbdmou.h */ - typedef struct _CONNECT_DATA { - PDEVICE_OBJECT ClassDeviceObject; - PVOID ClassService; - } CONNECT_DATA, *PCONNECT_DATA; - - /* FIXME: should be in kbdmou.h */ - #define IOCTL_INTERNAL_KEYBOARD_CONNECT \ - CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS) - - NTSTATUS STDCALL + NTSTATUS NTAPI ObReferenceObjectByName(PUNICODE_STRING ObjectPath, ULONG Attributes, PACCESS_STATE PassedAccessState, @@ -28,9 +19,6 @@ PVOID ParseContext, PVOID* ObjectPtr); - /* FIXME: should be in kbdmou.h */ - typedef VOID (*PSERVICE_CALLBACK_ROUTINE)(PDEVICE_OBJECT, PKEYBOARD_INPUT_DATA, PKEYBOARD_INPUT_DATA, PULONG); - typedef struct _CLASS_INFORMATION { PDEVICE_OBJECT DeviceObject; @@ -40,16 +28,7 @@ #define KEYBOARD_BUFFER_SIZE 100 #elif defined(_MSC_VER) - #include <ntddk.h> - #include <ntddser.h> - #include <kbdmou.h> - - #define STDCALL - - #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint - #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) - #define DPRINT DPRINT1 - #define CHECKPOINT CHECKPOINT1 + /* Nothing more to do */ #else #error Unknown compiler! #endif _____ Modified: trunk/reactos/drivers/dd/green/keyboard.c --- trunk/reactos/drivers/dd/green/keyboard.c 2005-10-28 07:04:05 UTC (rev 18825) +++ trunk/reactos/drivers/dd/green/keyboard.c 2005-10-28 07:49:16 UTC (rev 18826) @@ -1,14 +1,15 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VT100 emulator * FILE: drivers/dd/green/keyboard.c * PURPOSE: Keyboard part of green management * - * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG +#include <debug.h> + #include "green.h" static BOOLEAN @@ -138,7 +139,7 @@ return STATUS_SUCCESS; } -static VOID STDCALL +static VOID NTAPI KeyboardDpcSendData( IN PKDPC Dpc, IN PVOID pDeviceExtension, /* real type PKEYBOARD_DEVICE_EXTENSION */ @@ -161,7 +162,7 @@ DeviceExtension->InputDataCount[Queue] = 0; } -static VOID STDCALL +static VOID NTAPI KeyboardDeviceWorker( PVOID Context) { _____ Modified: trunk/reactos/drivers/dd/green/misc.c --- trunk/reactos/drivers/dd/green/misc.c 2005-10-28 07:04:05 UTC (rev 18825) +++ trunk/reactos/drivers/dd/green/misc.c 2005-10-28 07:49:16 UTC (rev 18826) @@ -1,14 +1,15 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VT100 emulator * FILE: drivers/dd/green/misc.c * PURPOSE: Misceallenous operations * - * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ //#define NDEBUG +#include <debug.h> + #include "green.h" NTSTATUS _____ Modified: trunk/reactos/drivers/dd/green/pnp.c --- trunk/reactos/drivers/dd/green/pnp.c 2005-10-28 07:04:05 UTC (rev 18825) +++ trunk/reactos/drivers/dd/green/pnp.c 2005-10-28 07:49:16 UTC (rev 18826) @@ -1,17 +1,18 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VT100 emulator * FILE: drivers/dd/green/pnp.c * PURPOSE: IRP_MJ_PNP operations * - * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG +#include <debug.h> + #include "green.h" -NTSTATUS STDCALL +NTSTATUS NTAPI GreenAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo) _____ Modified: trunk/reactos/drivers/dd/green/screen.c --- trunk/reactos/drivers/dd/green/screen.c 2005-10-28 07:04:05 UTC (rev 18825) +++ trunk/reactos/drivers/dd/green/screen.c 2005-10-28 07:49:16 UTC (rev 18826) @@ -1,5 +1,4 @@ -/* $Id: - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VT100 emulator * FILE: drivers/dd/green/screen.c @@ -7,12 +6,13 @@ * * PROGRAMMERS: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) * Art Yerkes - * HervÚ Poussineau (hpoussin(a)reactos.com) + * HervÚ Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG +#include <debug.h> + #include "green.h" -#include <stdarg.h> #define ESC ((UCHAR)0x1b)

1 0

[arty] 18825: Added build xml.
by arty＠svn.reactos.com 28 Oct '05

28 Oct '05

Added build xml. Added: trunk/reactos/drivers/dd/green/green.xml _____ Added: trunk/reactos/drivers/dd/green/green.xml --- trunk/reactos/drivers/dd/green/green.xml 2005-10-28 07:03:31 UTC (rev 18824) +++ trunk/reactos/drivers/dd/green/green.xml 2005-10-28 07:04:05 UTC (rev 18825) @@ -0,0 +1,14 @@ +<module name="green" type="kernelmodedriver" installbase="system32/drivers" installname="green.sys"> + <bootstrap base="reactos" /> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>createclose.c</file> + <file>dispatch.c</file> + <file>green.c</file> + <file>keyboard.c</file> + <file>misc.c</file> + <file>pnp.c</file> + <file>screen.c</file> + <file>green.rc</file> +</module>

1 0

[arty] 18824: Add green.
by arty＠svn.reactos.com 28 Oct '05

28 Oct '05

Add green. Modified: trunk/reactos/drivers/dd/directory.xml _____ Modified: trunk/reactos/drivers/dd/directory.xml --- trunk/reactos/drivers/dd/directory.xml 2005-10-28 07:03:08 UTC (rev 18823) +++ trunk/reactos/drivers/dd/directory.xml 2005-10-28 07:03:31 UTC (rev 18824) @@ -4,6 +4,9 @@ <directory name="blue"> <xi:include href="blue/blue.xml" /> </directory> +<directory name="green"> + <xi:include href="green/green.xml" /> +</directory> <directory name="bootvid"> <xi:include href="bootvid/bootvid.xml" /> </directory>

1 0

[arty] 18823: Make green build with rbuild and current headers.
by arty＠svn.reactos.com 28 Oct '05

28 Oct '05

Make green build with rbuild and current headers. Modified: trunk/reactos/drivers/dd/green/green.h _____ Modified: trunk/reactos/drivers/dd/green/green.h --- trunk/reactos/drivers/dd/green/green.h 2005-10-28 01:29:55 UTC (rev 18822) +++ trunk/reactos/drivers/dd/green/green.h 2005-10-28 07:03:08 UTC (rev 18823) @@ -1,9 +1,10 @@ #if defined(__GNUC__) #include <ddk/ntddk.h> #include <ddk/ntddser.h> - #include <ntos/halfuncs.h> - #include <ddk/ntddblue.h> + #include <wincon.h> + #include <drivers/blue/ntddblue.h> #include <ddk/ntddkbd.h> /* should be in kbdmou.h */ + #include <winbase.h> #include <debug.h>

1 0

[npwoods] 18822: Fixed notepad bug when creating a file on the command line
by npwoods＠svn.reactos.com 28 Oct '05

28 Oct '05

Fixed notepad bug when creating a file on the command line Modified: trunk/reactos/subsys/system/notepad/main.c _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-10-28 00:54:31 UTC (rev 18821) +++ trunk/reactos/subsys/system/notepad/main.c 2005-10-28 01:29:55 UTC (rev 18822) @@ -450,10 +450,10 @@ cmdline[lstrlen(cmdline) - 1] = 0; } - if (FileExists(cmdline)) + file_name = cmdline; + if (FileExists(file_name)) { file_exists = TRUE; - file_name = cmdline; } else if (!HasFileExtension(cmdline)) { @@ -469,13 +469,12 @@ lstrcpyn(buf, cmdline, MAX_PATH - lstrlen(txtW) - 1); lstrcat(buf, txtW); file_name = buf; - file_exists = FileExists(buf); + file_exists = FileExists(file_name); } } if (file_exists) { - file_name = cmdline; DoOpenFile(file_name); InvalidateRect(Globals.hMainWnd, NULL, FALSE); if (opt_print)

1 0

[turner] 18821: update todo.txt with current status
by turner＠svn.reactos.com 28 Oct '05

28 Oct '05

update todo.txt with current status Modified: trunk/reactos/subsys/system/cmd/todo.txt _____ Modified: trunk/reactos/subsys/system/cmd/todo.txt --- trunk/reactos/subsys/system/cmd/todo.txt 2005-10-28 00:38:46 UTC (rev 18820) +++ trunk/reactos/subsys/system/cmd/todo.txt 2005-10-28 00:54:31 UTC (rev 18821) @@ -29,8 +29,5 @@ *Reg Testing We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression. -*Remove dependance on __REACTOS__ -__REACTOS__ = 0 doesnt compile and is useless. __REACTOS__ = 1 has been the default and works just fine on windows. - *Add Breaker THere is partly code in place for this already. However it is broken and not finished. PocketCMD which is open source and based off ros cmd does do this correctly though. So there is something to look at and see how it can be done. though it is hard to find where they are doing it even though they are based on eachother they look pretty different now a days. \ No newline at end of file

1 0

[cwittich] 18820: fixed some warnings
by cwittich＠svn.reactos.com 28 Oct '05

28 Oct '05

fixed some warnings Modified: trunk/reactos/subsys/system/sndvol32/mixer.c _____ Modified: trunk/reactos/subsys/system/sndvol32/mixer.c --- trunk/reactos/subsys/system/sndvol32/mixer.c 2005-10-28 00:14:27 UTC (rev 18819) +++ trunk/reactos/subsys/system/sndvol32/mixer.c 2005-10-28 00:38:46 UTC (rev 18820) @@ -369,7 +369,7 @@ { if (Mixer->hmx) { - int lnsz = lstrlen(Mixer->Caps.szPname); + UINT lnsz = (UINT) lstrlen(Mixer->Caps.szPname); if(lnsz + 1 > uSize) { return lnsz + 1; @@ -409,7 +409,7 @@ if (lpl != NULL) { - lnsz = lstrlen(LongName ? lpl->szName : lpl->szShortName); + lnsz = (UINT) lstrlen(LongName ? lpl->szName : lpl->szShortName); if(lnsz + 1 > uSize) { return lnsz + 1;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005