mirror of
https://github.com/reactos/reactos.git
synced 2024-10-21 13:00:24 +00:00
[DXDIAGN]
* 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. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61722
This commit is contained in:
parent
ee32b9379c
commit
f27d6ca001
|
@ -7,6 +7,7 @@ list(APPEND SOURCE
|
||||||
container.c
|
container.c
|
||||||
dxdiag_main.c
|
dxdiag_main.c
|
||||||
provider.c
|
provider.c
|
||||||
|
guid.c
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def)
|
${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def)
|
||||||
|
|
||||||
add_idl_headers(dxdiagn_idlheader fil_data.idl)
|
add_idl_headers(dxdiagn_idlheader fil_data.idl)
|
||||||
|
|
|
@ -19,14 +19,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#include "dxdiag_private.h"
|
#include "dxdiag_private.h"
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
|
|
||||||
|
|
||||||
static inline IDxDiagContainerImpl *impl_from_IDxDiagContainer(IDxDiagContainer *iface)
|
static inline IDxDiagContainerImpl *impl_from_IDxDiagContainer(IDxDiagContainer *iface)
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,22 +19,9 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <objbase.h>
|
|
||||||
#include <oleauto.h>
|
|
||||||
#include <oleidl.h>
|
|
||||||
#include <rpcproxy.h>
|
|
||||||
#include <initguid.h>
|
|
||||||
#include "dxdiag_private.h"
|
#include "dxdiag_private.h"
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
|
#include <rpcproxy.h>
|
||||||
|
|
||||||
HINSTANCE dxdiagn_instance = 0;
|
HINSTANCE dxdiagn_instance = 0;
|
||||||
|
|
||||||
|
|
|
@ -21,21 +21,31 @@
|
||||||
#ifndef __WINE_DXDIAG_PRIVATE_H
|
#ifndef __WINE_DXDIAG_PRIVATE_H
|
||||||
#define __WINE_DXDIAG_PRIVATE_H
|
#define __WINE_DXDIAG_PRIVATE_H
|
||||||
|
|
||||||
|
#include <wine/config.h>
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#define WIN32_NO_STATUS
|
||||||
#define _INC_WINDOWS
|
#define _INC_WINDOWS
|
||||||
#define COM_NO_WINDOWS_H
|
#define COM_NO_WINDOWS_H
|
||||||
|
|
||||||
#include <stdarg.h>
|
#define COBJMACROS
|
||||||
|
#define NONAMELESSUNION
|
||||||
|
#define NONAMELESSSTRUCT
|
||||||
|
|
||||||
#include <windef.h>
|
#include <windef.h>
|
||||||
#include <winbase.h>
|
#include <winbase.h>
|
||||||
#include <wingdi.h>
|
#include <wingdi.h>
|
||||||
|
|
||||||
#include <wine/list.h>
|
#include <wine/debug.h>
|
||||||
#include <wine/dxdiag.h>
|
#include <wine/dxdiag.h>
|
||||||
|
#include <wine/list.h>
|
||||||
|
#include <wine/unicode.h>
|
||||||
|
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
|
||||||
|
|
||||||
/* DXDiag Interfaces: */
|
/* DXDiag Interfaces: */
|
||||||
typedef struct IDxDiagProviderImpl IDxDiagProviderImpl;
|
typedef struct IDxDiagProviderImpl IDxDiagProviderImpl;
|
||||||
typedef struct IDxDiagContainerImpl IDxDiagContainerImpl;
|
typedef struct IDxDiagContainerImpl IDxDiagContainerImpl;
|
||||||
|
|
|
@ -16,6 +16,8 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <windef.h>
|
||||||
|
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
|
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
|
||||||
|
|
18
reactos/dll/directx/wine/dxdiagn/guid.c
Normal file
18
reactos/dll/directx/wine/dxdiagn/guid.c
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
#define WIN32_NO_STATUS
|
||||||
|
#define _INC_WINDOWS
|
||||||
|
#define COM_NO_WINDOWS_H
|
||||||
|
|
||||||
|
#include <windef.h>
|
||||||
|
#include <winbase.h>
|
||||||
|
#include <wingdi.h>
|
||||||
|
#include <objbase.h>
|
||||||
|
#include <initguid.h>
|
||||||
|
#include <fil_data.h>
|
||||||
|
#include <wbemcli.h>
|
||||||
|
#include <wine/dxdiag.h>
|
||||||
|
|
||||||
|
/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
|
|
@ -20,30 +20,15 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
#include "dxdiag_private.h"
|
#include "dxdiag_private.h"
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <winver.h>
|
#include <winver.h>
|
||||||
#include <wingdi.h>
|
|
||||||
#include <objidl.h>
|
|
||||||
#include <uuids.h>
|
#include <uuids.h>
|
||||||
#include <vfw.h>
|
|
||||||
#include <mmddk.h>
|
|
||||||
#include <d3d9.h>
|
#include <d3d9.h>
|
||||||
#include <strmif.h>
|
|
||||||
#include <initguid.h>
|
|
||||||
#include <fil_data.h>
|
#include <fil_data.h>
|
||||||
#include <psapi.h>
|
#include <psapi.h>
|
||||||
#include <wbemcli.h>
|
#include <wbemcli.h>
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
|
|
||||||
|
|
||||||
static const WCHAR szEmpty[] = {0};
|
static const WCHAR szEmpty[] = {0};
|
||||||
|
|
||||||
static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_root);
|
static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_root);
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <windef.h>
|
#pragma once
|
||||||
|
|
||||||
#define IDS_REGIONAL_SETTING 1
|
#define IDS_REGIONAL_SETTING 1
|
||||||
#define IDS_PAGE_FILE_FORMAT 2
|
#define IDS_PAGE_FILE_FORMAT 2
|
||||||
|
|
Loading…
Reference in a new issue