[ros-diffs] [sserapion] 40154: Convert to C, its easier to link(specially in the kernel). :)

Author: sserapion
Date: Sat Mar 21 13:39:37 2009
New Revision: 40154

URL: http://svn.reactos.org/svn/reactos?rev=40154&view=rev
Log:
Convert to C, its easier to link(specially in the kernel). :)

Added:
    branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/stubs.c   (with props)
Removed:
    branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp
Modified:
    branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild

Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild [iso-8859-1]
Sat Mar 21 13:39:37 2009
@@ -7,6 +7,6 @@
 	<importlibrary definition="drmk.spec" />
 	<library>ntoskrnl</library>
 	<define name="BUILDING_DRMK" />
-	<file>stubs.cpp</file>
+	<file>stubs.c</file>
 	<file>drmk.rc</file>
 </module>

Added: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/stubs.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/stubs.c (added)
+++ branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/stubs.c [iso-8859-1] Sat
Mar 21 13:39:37 2009
@@ -1,0 +1,133 @@
+/*
+    ReactOS Kernel Streaming
+    Digital Rights Management
+
+    Please see COPYING in the top-level directory for license information.
+
+    Author: Andrew Greenwood
+
+    Notes:
+    This is just a file containing stub functions. The DRMK kernel library
+    deals with Digital Rights Management. This is not essential for the
+    operation of audio/video (except in the cases where content has digital
+    rights information) but is needed for linking with PORTCLS.
+*/
+
+#include <ntddk.h>
+#include <portcls.h>
+#include <debug.h>
+
+/*
+    Provide a driver interface consisting of functions for handling DRM
+    protected content
+*/
+/*
+ * @unimplemented
+ */
+NTAPI NTSTATUS
+DrmAddContentHandlers(
+    IN  ULONG ContentId,
+    IN  PVOID *paHandlers,
+    IN  ULONG NumHandlers)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+/*
+    Creates a DRM content ID to identify a KS audio stream containing
+    mixed content from several input streams.
+*/
+/*
+ * @unimplemented
+ */
+NTAPI NTSTATUS
+DrmCreateContentMixed(
+    IN  PULONG paContentId,
+    IN  ULONG cContentId,
+    OUT PULONG pMixedContentId)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+/*
+    Deletes a DRM content ID.
+*/
+/*
+ * @unimplemented
+ */
+NTAPI NTSTATUS
+DrmDestroyContent(
+    IN  ULONG ContentId)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+/*
+    Authenticates a driver, then passes it the DRM content ID, along with
+    the content rights which have been assigned to a stream.
+*/
+/*
+ * @unimplemented
+ */
+NTAPI NTSTATUS
+DrmForwardContentToDeviceObject(
+    IN  ULONG ContentId,
+    IN  PVOID Reserved,
+    IN  PCDRMFORWARD DrmForward)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+/*
+    Obsolete because it forces the system to run at a lower DRM security
+    level. Returns STATUS_NOT_IMPLEMENTED if a pin associated with
+    FileObject doesnt support the rights assigned to ContentId.
+*/
+/*
+ * @unimplemented
+ */
+NTAPI NTSTATUS
+DrmForwardContentToFileObject(
+    IN  ULONG ContentId,
+    IN  PFILE_OBJECT FileObject)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+/*
+    Similar to DrmForwardContentToDeviceObject, except this works with a driver
+    object rather than just a driver.
+*/
+/*
+ * @unimplemented
+ */
+NTAPI NTSTATUS
+DrmForwardContentToInterface(
+    IN  ULONG ContentId,
+    IN  PUNKNOWN pUnknown,
+    IN  ULONG NumMethods)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+/*
+    Retrieves DRM Content rights that have been assigend to a DRM Content ID.
+*/
+/*
+ * @unimplemented
+ */
+NTAPI NTSTATUS
+DrmGetContentRights(
+    IN  ULONG ContentId,
+    OUT PDRMRIGHTS DrmRights)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+

Propchange: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/stubs.c
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp (removed)
@@ -1,133 +1,0 @@
-/*
-    ReactOS Kernel Streaming
-    Digital Rights Management
-
-    Please see COPYING in the top-level directory for license information.
-
-    Author: Andrew Greenwood
-
-    Notes:
-    This is just a file containing stub functions. The DRMK kernel library
-    deals with Digital Rights Management. This is not essential for the
-    operation of audio/video (except in the cases where content has digital
-    rights information) but is needed for linking with PORTCLS.
-*/
-
-#include <ntddk.h>
-#include <portcls.h>
-#include <debug.h>
-
-/*
-    Provide a driver interface consisting of functions for handling DRM
-    protected content
-*/
-/*
- * @unimplemented
- */
-NTAPI NTSTATUS
-DrmAddContentHandlers(
-    IN  ULONG ContentId,
-    IN  PVOID *paHandlers,
-    IN  ULONG NumHandlers)
-{
-    UNIMPLEMENTED;
-    return STATUS_UNSUCCESSFUL;
-}
-
-/*
-    Creates a DRM content ID to identify a KS audio stream containing
-    mixed content from several input streams.
-*/
-/*
- * @unimplemented
- */
-NTAPI NTSTATUS
-DrmCreateContentMixed(
-    IN  PULONG paContentId,
-    IN  ULONG cContentId,
-    OUT PULONG pMixedContentId)
-{
-    UNIMPLEMENTED;
-    return STATUS_UNSUCCESSFUL;
-}
-
-/*
-    Deletes a DRM content ID.
-*/
-/*
- * @unimplemented
- */
-NTAPI NTSTATUS
-DrmDestroyContent(
-    IN  ULONG ContentId)
-{
-    UNIMPLEMENTED;
-    return STATUS_UNSUCCESSFUL;
-}
-
-/*
-    Authenticates a driver, then passes it the DRM content ID, along with
-    the content rights which have been assigned to a stream.
-*/
-/*
- * @unimplemented
- */
-NTAPI NTSTATUS
-DrmForwardContentToDeviceObject(
-    IN  ULONG ContentId,
-    IN  PVOID Reserved,
-    IN  PCDRMFORWARD DrmForward)
-{
-    UNIMPLEMENTED;
-    return STATUS_UNSUCCESSFUL;
-}
-
-/*
-    Obsolete because it forces the system to run at a lower DRM security
-    level. Returns STATUS_NOT_IMPLEMENTED if a pin associated with
-    FileObject doesnt support the rights assigned to ContentId.
-*/
-/*
- * @unimplemented
- */
-NTAPI NTSTATUS
-DrmForwardContentToFileObject(
-    IN  ULONG ContentId,
-    IN  PFILE_OBJECT FileObject)
-{
-    UNIMPLEMENTED;
-    return STATUS_UNSUCCESSFUL;
-}
-
-/*
-    Similar to DrmForwardContentToDeviceObject, except this works with a driver
-    object rather than just a driver.
-*/
-/*
- * @unimplemented
- */
-NTAPI NTSTATUS
-DrmForwardContentToInterface(
-    IN  ULONG ContentId,
-    IN  PUNKNOWN pUnknown,
-    IN  ULONG NumMethods)
-{
-    UNIMPLEMENTED;
-    return STATUS_UNSUCCESSFUL;
-}
-
-/*
-    Retrieves DRM Content rights that have been assigend to a DRM Content ID.
-*/
-/*
- * @unimplemented
- */
-NTAPI NTSTATUS
-DrmGetContentRights(
-    IN  ULONG ContentId,
-    OUT PDRMRIGHTS DrmRights)
-{
-    UNIMPLEMENTED;
-    return STATUS_UNSUCCESSFUL;
-}
-