26 Oct
2009
26 Oct
'09
10:54 a.m.
Author: janderwald
Date: Mon Oct 26 11:54:05 2009
New Revision: 43774
URL: http://svn.reactos.org/svn/reactos?rev=43774&view=rev
Log:
- Add an initial stub of DSound
Added:
trunk/reactos/dll/directx/dsound_new/ (with props)
trunk/reactos/dll/directx/dsound_new/classfactory.c (contents, props changed)
- copied, changed from r43773, trunk/reactos/dll/win32/netshell/classfactory.c
trunk/reactos/dll/directx/dsound_new/dsound.c (with props)
trunk/reactos/dll/directx/dsound_new/dsound.spec (props changed)
- copied unchanged from r43773, trunk/reactos/dll/directx/dsound/dsound.spec
trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild (with props)
trunk/reactos/dll/directx/dsound_new/precomp.h (with props)
trunk/reactos/dll/directx/dsound_new/stubs.c (with props)
trunk/reactos/dll/directx/dsound_new/version.rc (with props)
Propchange: trunk/reactos/dll/directx/dsound_new/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Oct 26 11:54:05 2009
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/dll/directx/dsound_new/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/dll/directx/dsound_new/
------------------------------------------------------------------------------
bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/dll/directx/dsound_new/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Copied: trunk/reactos/dll/directx/dsound_new/classfactory.c (from r43773,
trunk/reactos/dll/win32/netshell/classfactory.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cla…
==============================================================================
--- trunk/reactos/dll/win32/netshell/classfactory.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dsound_new/classfactory.c [iso-8859-1] Mon Oct 26 11:54:05
2009
@@ -1,4 +1,14 @@
-#include <precomp.h>
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS Configuration of network devices
+ * FILE: dll/directx/dsound_new/classfactory.c
+ * PURPOSE: IClassFactory implementation
+ *
+ * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org)
+ */
+
+
+#include "precomp.h"
typedef struct
{
Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 26 11:54:05 2009
@@ -1,0 +1,1 @@
+/branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682
Added: trunk/reactos/dll/directx/dsound_new/dsound.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso…
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/dsound.c (added)
+++ trunk/reactos/dll/directx/dsound_new/dsound.c [iso-8859-1] Mon Oct 26 11:54:05 2009
@@ -1,0 +1,52 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS Configuration of network devices
+ * FILE: dll/directx/dsound_new/dsound.c
+ * PURPOSE: Handles DSound initialization
+ *
+ * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org)
+ */
+
+#include "precomp.h"
+
+
+HINSTANCE dsound_hInstance;
+
+HRESULT
+WINAPI
+DllCanUnloadNow()
+{
+ return S_FALSE;
+}
+
+HRESULT
+WINAPI
+DllGetClassObject(
+ REFCLSID rclsid,
+ REFIID riid,
+ LPVOID *ppv)
+{
+ UNIMPLEMENTED
+ return CLASS_E_CLASSNOTAVAILABLE;
+}
+
+BOOL
+WINAPI
+DllMain(
+ HINSTANCE hInstDLL,
+ DWORD fdwReason,
+ LPVOID lpvReserved)
+{
+ switch (fdwReason)
+ {
+ case DLL_PROCESS_ATTACH:
+ dsound_hInstance = hInstDLL;
+ DisableThreadLibraryCalls(dsound_hInstance);
+ break;
+ default:
+ break;
+ }
+
+ return TRUE;
+}
+
Propchange: trunk/reactos/dll/directx/dsound_new/dsound.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/directx/dsound_new/dsound.spec
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/directx/dsound_new/dsound.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 26 11:54:05 2009
@@ -1,0 +1,1 @@
+/branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682
Added: trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso…
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild (added)
+++ trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild [iso-8859-1] Mon Oct 26
11:54:05 2009
@@ -1,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="dsound_new" type="win32dll"
baseaddress="${BASEADDRESS_DSOUND}" installbase="system32"
installname="dsound_new.dll" crt="msvcrt">
+ <autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
+ <importlibrary definition="dsound.spec" />
+ <include base="dsound">.</include>
+ <library>uuid</library>
+ <library>ntdll</library>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>advapi32</library>
+ <library>ole32</library>
+ <library>winmm</library>
+ <library>dxguid</library>
+ <file>classfactory.c</file>
+ <file>dsound.c</file>
+ <file>stubs.c</file>
+ <file>version.rc</file>
+</module>
Propchange: trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/directx/dsound_new/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pre…
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/precomp.h (added)
+++ trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] Mon Oct 26 11:54:05 2009
@@ -1,0 +1,30 @@
+#ifndef PRECOMP_H__
+#define PRECOMP_H__
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windows.h>
+#include <setupapi.h>
+#include <olectl.h>
+#include <unknwn.h>
+#include <dsound.h>
+#include <debug.h>
+
+
+/* factory method */
+typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID*
ppvObject);
+
+/* factory table */
+typedef struct
+{
+ REFIID riid;
+ LPFNCREATEINSTANCE lpfnCI;
+} INTERFACE_TABLE;
+
+/* globals */
+extern HINSTANCE dsound_hInstance;
+
+
+#endif
Propchange: trunk/reactos/dll/directx/dsound_new/precomp.h
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/directx/dsound_new/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/stu…
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/stubs.c (added)
+++ trunk/reactos/dll/directx/dsound_new/stubs.c [iso-8859-1] Mon Oct 26 11:54:05 2009
@@ -1,0 +1,137 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS Configuration of network devices
+ * FILE: dll/directx/dsound_new/stubs.c
+ * PURPOSE: DSound stubs
+ *
+ * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org)
+ */
+
+#include "precomp.h"
+
+HRESULT
+WINAPI
+DirectSoundCreate(
+ LPCGUID lpcGUID,
+ LPDIRECTSOUND *ppDS,
+ IUnknown *pUnkOuter)
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
+
+
+HRESULT
+WINAPI
+DirectSoundEnumerateA(
+ LPDSENUMCALLBACKA lpDSEnumCallback,
+ LPVOID lpContext)
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
+
+HRESULT
+WINAPI
+DirectSoundEnumerateW(
+ LPDSENUMCALLBACKW lpDSEnumCallback,
+ LPVOID lpContext )
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
+
+HRESULT
+WINAPI
+DllRegisterServer(void)
+{
+ UNIMPLEMENTED
+ return SELFREG_E_CLASS;
+}
+
+HRESULT
+WINAPI
+DllUnregisterServer(void)
+{
+ UNIMPLEMENTED
+ return SELFREG_E_CLASS;
+}
+
+HRESULT
+WINAPI
+DirectSoundCaptureCreate(
+ LPCGUID lpcGUID,
+ LPDIRECTSOUNDCAPTURE *ppDSC,
+ LPUNKNOWN pUnkOuter)
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
+
+HRESULT
+WINAPI
+DirectSoundCaptureCreate8(
+ LPCGUID lpcGUID,
+ LPDIRECTSOUNDCAPTURE8 *ppDSC8,
+ LPUNKNOWN pUnkOuter)
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
+
+HRESULT
+WINAPI
+DirectSoundCreate8(
+ LPCGUID lpcGUID,
+ LPDIRECTSOUND8 *ppDS,
+ IUnknown *pUnkOuter)
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
+
+HRESULT
+WINAPI
+DirectSoundFullDuplexCreate(
+ LPCGUID pcGuidCaptureDevice,
+ LPCGUID pcGuidRenderDevice,
+ LPCDSCBUFFERDESC pcDSCBufferDesc,
+ LPCDSBUFFERDESC pcDSBufferDesc,
+ HWND hWnd,
+ DWORD dwLevel,
+ LPDIRECTSOUNDFULLDUPLEX *ppDSFD,
+ LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8,
+ LPDIRECTSOUNDBUFFER8 *ppDSBuffer8,
+ LPUNKNOWN pUnkOuter)
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
+
+HRESULT
+WINAPI
+DirectSoundCaptureEnumerateA(
+ LPDSENUMCALLBACKA lpDSEnumCallback,
+ LPVOID lpContext)
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
+
+HRESULT
+WINAPI
+DirectSoundCaptureEnumerateW(
+ LPDSENUMCALLBACKW lpDSEnumCallback,
+ LPVOID lpContext)
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
+
+HRESULT
+WINAPI
+GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest)
+{
+ UNIMPLEMENTED
+ return DSERR_INVALIDPARAM;
+}
Propchange: trunk/reactos/dll/directx/dsound_new/stubs.c
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/directx/dsound_new/version.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/ver…
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/version.rc (added)
+++ trunk/reactos/dll/directx/dsound_new/version.rc [iso-8859-1] Mon Oct 26 11:54:05 2009
@@ -1,0 +1,14 @@
+#include <windows.h>
+#include "shlobj.h"
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION "DirectSound\0"
+#define REACTOS_STR_INTERNAL_NAME "dsound.dll\0"
+#define REACTOS_STR_ORIGINAL_FILENAME "dsound.dll\0"
+#define REACTOS_STR_PRODUCT_VERSION "5.3.1.904\0"
+#define REACTOS_STR_FILE_VERSION "5.3.1.904\0"
+
+#include <reactos/version.rc>
Propchange: trunk/reactos/dll/directx/dsound_new/version.rc
------------------------------------------------------------------------------
svn:eol-style = native