From 5299045fca22858587a2e97ef4a9007d8b7fd9f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=A9=20van=20Geldorp?= Date: Wed, 14 Dec 2005 23:09:06 +0000 Subject: [PATCH] dxdiagn vendor import svn path=/trunk/; revision=20182 --- reactos/lib/dxdiagn/container.c | 321 ++++++++++++++++ reactos/lib/dxdiagn/dxdiag_main.c | 127 ++++++ reactos/lib/dxdiagn/dxdiag_private.h | 120 ++++++ reactos/lib/dxdiagn/dxdiagn.spec | 4 + reactos/lib/dxdiagn/dxdiagn.xml | 28 ++ reactos/lib/dxdiagn/provider.c | 119 ++++++ reactos/lib/dxdiagn/regsvr.c | 555 +++++++++++++++++++++++++++ reactos/lib/dxdiagn/version.rc | 26 ++ reactos/media/doc/README.WINE | 1 + 9 files changed, 1301 insertions(+) create mode 100644 reactos/lib/dxdiagn/container.c create mode 100644 reactos/lib/dxdiagn/dxdiag_main.c create mode 100644 reactos/lib/dxdiagn/dxdiag_private.h create mode 100644 reactos/lib/dxdiagn/dxdiagn.spec create mode 100644 reactos/lib/dxdiagn/dxdiagn.xml create mode 100644 reactos/lib/dxdiagn/provider.c create mode 100644 reactos/lib/dxdiagn/regsvr.c create mode 100644 reactos/lib/dxdiagn/version.rc diff --git a/reactos/lib/dxdiagn/container.c b/reactos/lib/dxdiagn/container.c new file mode 100644 index 00000000000..aa15d1082e0 --- /dev/null +++ b/reactos/lib/dxdiagn/container.c @@ -0,0 +1,321 @@ +/* + * IDxDiagContainer Implementation + * + * Copyright 2004 Raphael Junqueira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "config.h" +#include "dxdiag_private.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +/* IDxDiagContainer IUnknown parts follow: */ +HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj) +{ + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDxDiagContainer)) { + IDxDiagContainerImpl_AddRef(iface); + *ppobj = This; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); + + DXDIAGN_LockModule(); + + return refCount; +} + +ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); + + if (!refCount) { + HeapFree(GetProcessHeap(), 0, This); + } + + DXDIAGN_UnlockModule(); + + return refCount; +} + +/* IDxDiagContainer Interface follow: */ +HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCONTAINER iface, DWORD* pdwCount) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + TRACE("(%p)\n", iface); + if (NULL == pdwCount) { + return E_INVALIDARG; + } + *pdwCount = This->nSubContainers; + return S_OK; +} + +HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_SubContainer* p = NULL; + DWORD i = 0; + + TRACE("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszContainer), cchContainer); + + if (NULL == pwszContainer) { + return E_INVALIDARG; + } + if (256 > cchContainer) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + + p = This->subContainers; + while (NULL != p) { + if (dwIndex == i) { + if (cchContainer <= strlenW(p->contName)) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + lstrcpynW(pwszContainer, p->contName, cchContainer); + return S_OK; + } + p = p->next; + ++i; + } + return E_INVALIDARG; +} + +HRESULT WINAPI IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_SubContainer* p = NULL; + + p = This->subContainers; + while (NULL != p) { + if (0 == lstrcmpW(p->contName, pwszContainer)) { + *ppInstance = (PDXDIAGCONTAINER)p->pCont; + return S_OK; + } + p = p->next; + } + return E_INVALIDARG; +} + +HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainer* pContainer = NULL; + LPWSTR tmp, orig_tmp; + INT tmp_len; + WCHAR* cur; + HRESULT hr = E_INVALIDARG; + + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszContainer), ppInstance); + + if (NULL == ppInstance || NULL == pwszContainer) { + return E_INVALIDARG; + } + + pContainer = (PDXDIAGCONTAINER) This; + + tmp_len = strlenW(pwszContainer) + 1; + orig_tmp = tmp = HeapAlloc(GetProcessHeap(), 0, tmp_len * sizeof(WCHAR)); + if (NULL == tmp) return E_FAIL; + lstrcpynW(tmp, pwszContainer, tmp_len); + + cur = strchrW(tmp, '.'); + while (NULL != cur) { + *cur = '\0'; /* cut tmp string to '.' */ + hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); + if (!SUCCEEDED(hr) || NULL == pContainer) + goto on_error; + *cur++; /* go after '.' (just replaced by \0) */ + tmp = cur; + cur = strchrW(tmp, '.'); + } + + hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, ppInstance); + if (SUCCEEDED(hr)) { + IDxDiagContainerImpl_AddRef((PDXDIAGCONTAINER)*ppInstance); + } + +on_error: + HeapFree(GetProcessHeap(), 0, orig_tmp); + return hr; +} + +HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + TRACE("(%p)\n", iface); + if (NULL == pdwCount) { + return E_INVALIDARG; + } + *pdwCount = This->nProperties; + return S_OK; +} + +HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_Property* p = NULL; + DWORD i = 0; + + FIXME("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); + + if (NULL == pwszPropName) { + return E_INVALIDARG; + } + if (256 > cchPropName) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + + p = This->properties; + while (NULL != p) { + if (dwIndex == i) { + if (cchPropName <= lstrlenW(p->vName)) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + lstrcpynW(pwszPropName, p->vName, cchPropName); + return S_OK; + } + p = p->next; + ++i; + } + return E_INVALIDARG; +} + +HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_Property* p = NULL; + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pvarProp); + + if (NULL == pvarProp || NULL == pwszPropName) { + return E_INVALIDARG; + } + + p = This->properties; + while (NULL != p) { + if (0 == lstrcmpW(p->vName, pwszPropName)) { + VariantCopy(pvarProp, &p->v); + return S_OK; + } + p = p->next; + } + return S_OK; +} + +HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pVarProp) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_Property* p = NULL; + IDxDiagContainerImpl_Property* pNew = NULL; + + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pVarProp); + + if (NULL == pVarProp || NULL == pwszPropName) { + return E_INVALIDARG; + } + + pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_Property)); + if (NULL == pNew) { + return E_OUTOFMEMORY; + } + VariantInit(&pNew->v); + VariantCopy(&pNew->v, pVarProp); + pNew->vName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwszPropName) + 1) * sizeof(WCHAR)); + lstrcpyW(pNew->vName, pwszPropName); + pNew->next = NULL; + + p = This->properties; + if (NULL == p) { + This->properties = pNew; + } else { + while (NULL != p->next) { + p = p->next; + } + p->next = pNew; + } + ++This->nProperties; + return S_OK; +} + +HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pszContName, PDXDIAGCONTAINER pSubCont) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_SubContainer* p = NULL; + IDxDiagContainerImpl_SubContainer* pNew = NULL; + + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pszContName), pSubCont); + + if (NULL == pSubCont || NULL == pszContName) { + return E_INVALIDARG; + } + + pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_SubContainer)); + if (NULL == pNew) { + return E_OUTOFMEMORY; + } + pNew->pCont = pSubCont; + pNew->contName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pszContName) + 1) * sizeof(WCHAR)); + lstrcpyW(pNew->contName, pszContName); + pNew->next = NULL; + + p = This->subContainers; + if (NULL == p) { + This->subContainers = pNew; + } else { + while (NULL != p->next) { + p = p->next; + } + p->next = pNew; + } + ++This->nSubContainers; + return S_OK; +} + +static const IDxDiagContainerVtbl DxDiagContainer_Vtbl = +{ + IDxDiagContainerImpl_QueryInterface, + IDxDiagContainerImpl_AddRef, + IDxDiagContainerImpl_Release, + IDxDiagContainerImpl_GetNumberOfChildContainers, + IDxDiagContainerImpl_EnumChildContainerNames, + IDxDiagContainerImpl_GetChildContainer, + IDxDiagContainerImpl_GetNumberOfProps, + IDxDiagContainerImpl_EnumPropNames, + IDxDiagContainerImpl_GetProp +}; + + +HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, LPVOID *ppobj) { + IDxDiagContainerImpl* container; + + TRACE("(%p, %p)\n", debugstr_guid(riid), ppobj); + + container = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl)); + if (NULL == container) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } + container->lpVtbl = &DxDiagContainer_Vtbl; + container->ref = 0; /* will be inited with QueryInterface */ + return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)container, riid, ppobj); +} diff --git a/reactos/lib/dxdiagn/dxdiag_main.c b/reactos/lib/dxdiagn/dxdiag_main.c new file mode 100644 index 00000000000..b72f9cd464c --- /dev/null +++ b/reactos/lib/dxdiagn/dxdiag_main.c @@ -0,0 +1,127 @@ +/* + * DXDiag + * + * Copyright 2004 Raphael Junqueira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "config.h" +#include "dxdiag_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +LONG DXDIAGN_refCount = 0; + +/* At process attach */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%lx,%p\n", hInstDLL, fdwReason, lpvReserved); + if (fdwReason == DLL_PROCESS_ATTACH) { + DisableThreadLibraryCalls(hInstDLL); + } + return TRUE; +} + +/******************************************************************************* + * DXDiag ClassFactory + */ +typedef struct { + const IClassFactoryVtbl *lpVtbl; + REFCLSID rclsid; + HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +} IClassFactoryImpl; + +static HRESULT WINAPI DXDiagCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { + FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + + if (ppobj == NULL) return E_POINTER; + + return E_NOINTERFACE; +} + +static ULONG WINAPI DXDiagCF_AddRef(LPCLASSFACTORY iface) { + DXDIAGN_LockModule(); + + return 2; /* non-heap based object */ +} + +static ULONG WINAPI DXDiagCF_Release(LPCLASSFACTORY iface) { + DXDIAGN_UnlockModule(); + + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI DXDiagCF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); + + return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj); +} + +static HRESULT WINAPI DXDiagCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { + TRACE("(%d)\n", dolock); + + if (dolock) + DXDIAGN_LockModule(); + else + DXDIAGN_UnlockModule(); + + return S_OK; +} + +static const IClassFactoryVtbl DXDiagCF_Vtbl = { + DXDiagCF_QueryInterface, + DXDiagCF_AddRef, + DXDiagCF_Release, + DXDiagCF_CreateInstance, + DXDiagCF_LockServer +}; + +static IClassFactoryImpl DXDiag_CFS[] = { + { &DXDiagCF_Vtbl, &CLSID_DxDiagProvider, DXDiag_CreateDXDiagProvider }, + { NULL, NULL, NULL } +}; + +/*********************************************************************** + * DllCanUnloadNow (DXDIAGN.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return DXDIAGN_refCount != 0 ? S_FALSE : S_OK; +} + +/*********************************************************************** + * DllGetClassObject (DXDIAGN.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + int i = 0; + + TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + while (NULL != DXDiag_CFS[i].rclsid) { + if (IsEqualGUID(rclsid, DXDiag_CFS[i].rclsid)) { + DXDiagCF_AddRef((IClassFactory*) &DXDiag_CFS[i]); + *ppv = &DXDiag_CFS[i]; + return S_OK; + } + ++i; + } + + FIXME("(%p,%p,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/reactos/lib/dxdiagn/dxdiag_private.h b/reactos/lib/dxdiagn/dxdiag_private.h new file mode 100644 index 00000000000..86691e8cfda --- /dev/null +++ b/reactos/lib/dxdiagn/dxdiag_private.h @@ -0,0 +1,120 @@ +/* + * DXDiag private include file + * + * Copyright 2004 Raphael Junqueira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_DXDIAG_PRIVATE_H +#define __WINE_DXDIAG_PRIVATE_H + +#include + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" +#include "oleauto.h" + +#include "dxdiag.h" + +/* DXDiag Interfaces: */ +typedef struct IDxDiagProviderImpl IDxDiagProviderImpl; +typedef struct IDxDiagContainerImpl IDxDiagContainerImpl; + +/* ---------------- */ +/* IDxDiagProvider */ +/* ---------------- */ + +/***************************************************************************** + * IDxDiagProvider implementation structure + */ +struct IDxDiagProviderImpl { + /* IUnknown fields */ + const IDxDiagProviderVtbl *lpVtbl; + LONG ref; + /* IDxDiagProvider fields */ + BOOL init; + DXDIAG_INIT_PARAMS params; + IDxDiagContainer* pRootContainer; +}; + +/* IUnknown: */ +extern HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj); +extern ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface); +extern ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface); + +/* IDxDiagProvider: */ +extern HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT_PARAMS* pParams); +extern HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDiagContainer** ppInstance); + +/* ---------------- */ +/* IDxDiagContainer */ +/* ---------------- */ + +typedef struct IDxDiagContainerImpl_SubContainer { + IDxDiagContainer* pCont; + WCHAR* contName; + struct IDxDiagContainerImpl_SubContainer* next; +} IDxDiagContainerImpl_SubContainer; + +typedef struct IDxDiagContainerImpl_Property { + LPWSTR vName; + VARIANT v; + struct IDxDiagContainerImpl_Property* next; +} IDxDiagContainerImpl_Property; + + +/***************************************************************************** + * IDxDiagContainer implementation structure + */ +struct IDxDiagContainerImpl { + /* IUnknown fields */ + const IDxDiagContainerVtbl *lpVtbl; + LONG ref; + /* IDxDiagContainer fields */ + IDxDiagContainerImpl_Property* properties; + IDxDiagContainerImpl_SubContainer* subContainers; + DWORD nProperties; + DWORD nSubContainers; +}; + +/* IUnknown: */ +extern HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj); +extern ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface); + +/** Internal */ +extern HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pVarProp); +extern HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pszContName, PDXDIAGCONTAINER pSubCont); + +/** + * factories + */ +extern HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); + +/** internal factory */ +extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, LPVOID *ppobj); +extern HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont); + +/********************************************************************** + * Dll lifetime tracking declaration for dxdiagn.dll + */ +extern LONG DXDIAGN_refCount; +static inline void DXDIAGN_LockModule(void) { InterlockedIncrement( &DXDIAGN_refCount ); } +static inline void DXDIAGN_UnlockModule(void) { InterlockedDecrement( &DXDIAGN_refCount ); } + +#endif diff --git a/reactos/lib/dxdiagn/dxdiagn.spec b/reactos/lib/dxdiagn/dxdiagn.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/reactos/lib/dxdiagn/dxdiagn.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/reactos/lib/dxdiagn/dxdiagn.xml b/reactos/lib/dxdiagn/dxdiagn.xml new file mode 100644 index 00000000000..9de8c81d6e2 --- /dev/null +++ b/reactos/lib/dxdiagn/dxdiagn.xml @@ -0,0 +1,28 @@ + + + + . + include/wine + + + + + 0x600 + 0x501 + 0x501 + wine + uuid + ntdll + kernel32 + user32 + advapi32 + ole32 + oleaut32 + dxguid + strmiids + container.c + dxdiag_main.c + provider.c + regsvr.c + dxdiagn.spec + diff --git a/reactos/lib/dxdiagn/provider.c b/reactos/lib/dxdiagn/provider.c new file mode 100644 index 00000000000..3e6511948ca --- /dev/null +++ b/reactos/lib/dxdiagn/provider.c @@ -0,0 +1,119 @@ +/* + * IDxDiagProvider Implementation + * + * Copyright 2004 Raphael Junqueira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "config.h" +#include "dxdiag_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +/* IDxDiagProvider IUnknown parts follow: */ +HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj) +{ + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDxDiagProvider)) { + IDxDiagProviderImpl_AddRef(iface); + *ppobj = This; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface) { + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + TRACE("(%p) : AddRef from %ld\n", This, This->ref); + return ++(This->ref); +} + +ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + ULONG ref = --This->ref; + TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); + if (ref == 0) { + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +/* IDxDiagProvider Interface follow: */ +HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT_PARAMS* pParams) { + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + TRACE("(%p,%p)\n", iface, pParams); + + if (NULL == pParams) { + return E_POINTER; + } + if (pParams->dwSize != sizeof(DXDIAG_INIT_PARAMS)) { + return E_INVALIDARG; + } + + This->init = TRUE; + memcpy(&This->params, pParams, pParams->dwSize); + return S_OK; +} + +HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDiagContainer** ppInstance) { + HRESULT hr = S_OK; + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + TRACE("(%p,%p)\n", iface, ppInstance); + + if (NULL == ppInstance) { + return E_INVALIDARG; + } + if (FALSE == This->init) { + return E_INVALIDARG; /* should be E_CO_UNINITIALIZED */ + } + if (NULL == This->pRootContainer) { + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &This->pRootContainer); + if (FAILED(hr)) { + return hr; + } + } + return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)This->pRootContainer, &IID_IDxDiagContainer, (void**) ppInstance); +} + +IDxDiagProviderVtbl DxDiagProvider_Vtbl = +{ + IDxDiagProviderImpl_QueryInterface, + IDxDiagProviderImpl_AddRef, + IDxDiagProviderImpl_Release, + IDxDiagProviderImpl_Initialize, + IDxDiagProviderImpl_GetRootContainer +}; + +HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { + IDxDiagProviderImpl* provider; + + TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); + + provider = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagProviderImpl)); + if (NULL == provider) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } + provider->lpVtbl = &DxDiagProvider_Vtbl; + provider->ref = 0; /* will be inited with QueryInterface */ + return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj); +} diff --git a/reactos/lib/dxdiagn/regsvr.c b/reactos/lib/dxdiagn/regsvr.c new file mode 100644 index 00000000000..d5a003ebce5 --- /dev/null +++ b/reactos/lib/dxdiagn/regsvr.c @@ -0,0 +1,555 @@ +/* + * self-registerable dll functions for dxdiag.dll + * + * Copyright (C) 2004 Raphael Junqueira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define COM_NO_WINDOWS_H +#include +#include + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" + +#include "initguid.h" +#include "dxdiag_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/*********************************************************************** + * interface for self-registering + */ +struct regsvr_interface +{ + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ + LPCSTR viprogid; /* can be NULL to omit */ + LPCSTR progid_extra; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +/*********************************************************************** + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const curver_keyname[7] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const viprogid_keyname[25] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', + 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', + 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/*********************************************************************** + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); +static LONG register_progid(WCHAR const *clsid, + char const *progid, char const *curver_progid, + char const *name, char const *extra); +static LONG recursive_delete_key(HKEY key); +static LONG recursive_delete_keyA(HKEY base, char const *name); +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); + +/*********************************************************************** + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + wsprintfW(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = recursive_delete_keyW(interface_key, buf); + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->progid, NULL, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->viprogid) { + res = register_key_defvalueA(clsid_key, viprogid_keyname, + list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->viprogid, list->progid, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = recursive_delete_keyW(coclass_key, buf); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + + if (list->viprogid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * regsvr_key_guid + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) +{ + WCHAR buf[39]; + + StringFromGUID2(guid, buf, 39); + return register_key_defvalueW(base, name, buf); +} + +/*********************************************************************** + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_progid + */ +static LONG register_progid( + WCHAR const *clsid, + char const *progid, + char const *curver_progid, + char const *name, + char const *extra) +{ + LONG res; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) return res; + + if (name) { + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)name, strlen(name) + 1); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (clsid) { + res = register_key_defvalueW(progid_key, clsid_keyname, clsid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (curver_progid) { + res = register_key_defvalueA(progid_key, curver_keyname, + curver_progid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (extra) { + HKEY extra_key; + + res = RegCreateKeyExA(progid_key, extra, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &extra_key, NULL); + if (res == ERROR_SUCCESS) + RegCloseKey(extra_key); + } + +error_close_progid_key: + RegCloseKey(progid_key); + return res; +} + +/*********************************************************************** + * recursive_delete_key + */ +static LONG recursive_delete_key(HKEY key) +{ + LONG res; + WCHAR subkey_name[MAX_PATH]; + DWORD cName; + HKEY subkey; + + for (;;) { + cName = sizeof(subkey_name) / sizeof(WCHAR); + res = RegEnumKeyExW(key, 0, subkey_name, &cName, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { + res = ERROR_SUCCESS; /* presumably we're done enumerating */ + break; + } + res = RegOpenKeyExW(key, subkey_name, 0, + KEY_READ | KEY_WRITE, &subkey); + if (res == ERROR_FILE_NOT_FOUND) continue; + if (res != ERROR_SUCCESS) break; + + res = recursive_delete_key(subkey); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) break; + } + + if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); + return res; +} + +/*********************************************************************** + * recursive_delete_keyA + */ +static LONG recursive_delete_keyA(HKEY base, char const *name) +{ + LONG res; + HKEY key; + + res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * recursive_delete_keyW + */ +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) +{ + LONG res; + HKEY key; + + res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * coclass list + */ +static struct regsvr_coclass const coclass_list[] = { + { + &CLSID_DxDiagProvider, + "DxDiagProvider Class", + NULL, + "dxdiagn.dll", + "Apartment", + NULL, + "DxDiag.DxDiagProvider.1", + "DxDiag.DxDiagProvider" + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * interface list + */ + +static struct regsvr_interface const interface_list[] = { + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * DllRegisterServer (DXDIAGN.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_interfaces(interface_list); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (DXDIAGN.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_interfaces(interface_list); + return hr; +} diff --git a/reactos/lib/dxdiagn/version.rc b/reactos/lib/dxdiagn/version.rc new file mode 100644 index 00000000000..e4e973d3a93 --- /dev/null +++ b/reactos/lib/dxdiagn/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2004 Raphael Junqueira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine DxDiag 8" +#define WINE_FILENAME_STR "dxdiagn.dll" +#define WINE_FILEVERSION 5,3,1,902 +#define WINE_FILEVERSION_STR "5.3.1.902" +#define WINE_PRODUCTVERSION 5,3,1,902 +#define WINE_PRODUCTVERSION_STR "5.3" + +#include "wine/wine_common_ver.rc" diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index d102f90f8cc..e9365328dcc 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -46,6 +46,7 @@ reactos/lib/dinput # Synced to Wine-0_9_3 reactos/lib/dinput8 # Synced to Wine-0_9_3 reactos/lib/dplay # Synced to Wine-0_9_3 reactos/lib/dplayx # Synced to Wine-0_9_3 +reactos/lib/dxdiagn # Synced to Wine-0_9_3 reactos/lib/icmp # Synced to Wine-0_9_3 reactos/lib/imm32 # Synced to Wine-0_9_3 reactos/lib/iphlpapi # Out of sync -- 2.17.1