Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DXSDK] Improve dxerr?.h a bit (#1617)

Browse source 
*Use '||', instead of '|', on a '#if'.
*Synchronize some white spaces and blank lines.
This commit is contained in:
Serge Gautherie 2019-06-06 01:50:24 +02:00 committed by Hermès BÉLUSCA - MAÏTO
parent 96a4ab87d4
commit 2f0b265e8d
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sdk/include/dxsdk/dxerr8.h
View file

@ -1,5 +1,4 @@
#ifndef _DXERR8_H_ #ifndef _DXERR8_H_
#define _DXERR8_H_ #define _DXERR8_H_
@ -15,7 +14,6 @@ const WCHAR* WINAPI DXGetErrorString8W(HRESULT hr);
const WCHAR* WINAPI DXGetErrorDescription8W(HRESULT hr); const WCHAR* WINAPI DXGetErrorDescription8W(HRESULT hr);
HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox ); HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox );
#ifdef UNICODE #ifdef UNICODE
#define DXGetErrorString8 DXGetErrorString8W #define DXGetErrorString8 DXGetErrorString8W
#define DXGetErrorDescription8 DXGetErrorDescription8W #define DXGetErrorDescription8 DXGetErrorDescription8W
@ -26,7 +24,7 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC
#define DXTrace DXTraceA #define DXTrace DXTraceA
#endif #endif
#if defined(DEBUG) | defined(_DEBUG) #if defined(DEBUG) || defined(_DEBUG)
#define DXTRACE_MSG(str) DXTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE ) #define DXTRACE_MSG(str) DXTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE )
#define DXTRACE_ERR(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE ) #define DXTRACE_ERR(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE )
#define DXTRACE_ERR_NOMSGBOX(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE ) #define DXTRACE_ERR_NOMSGBOX(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE )
@ -36,10 +34,8 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC
#define DXTRACE_ERR_NOMSGBOX(str,hr) (hr) #define DXTRACE_ERR_NOMSGBOX(str,hr) (hr)
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif

9
sdk/include/dxsdk/dxerr9.h
View file

@ -1,11 +1,11 @@
#ifndef _DXERR9_H_
#ifndef _DXERR9_H_
#define _DXERR9_H_ #define _DXERR9_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
const char* WINAPI DXGetErrorString9A(HRESULT hr); const char* WINAPI DXGetErrorString9A(HRESULT hr);
const char* WINAPI DXGetErrorDescription9A(HRESULT hr); const char* WINAPI DXGetErrorDescription9A(HRESULT hr);
HRESULT WINAPI DXTraceA( const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox ); HRESULT WINAPI DXTraceA( const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox );
@ -24,8 +24,7 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC
#define DXTrace DXTraceA #define DXTrace DXTraceA
#endif #endif
#if defined(DEBUG) || defined(_DEBUG)
#if defined(DEBUG) | defined(_DEBUG)
#define DXTRACE_MSG(str) DXTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE ) #define DXTRACE_MSG(str) DXTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE )
#define DXTRACE_ERR(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE ) #define DXTRACE_ERR(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE )
#define DXTRACE_ERR_MSGBOX(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE ) #define DXTRACE_ERR_MSGBOX(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE )
@ -35,10 +34,8 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC
#define DXTRACE_ERR_MSGBOX(str,hr) (hr) #define DXTRACE_ERR_MSGBOX(str,hr) (hr)
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif