dxerr8: Don't use Wine debugging macros in static libraries.
This commit is contained in:
parent
dad21bbcbf
commit
7342508191
|
@ -38,10 +38,6 @@
|
||||||
|
|
||||||
#include "dxerr8.h"
|
#include "dxerr8.h"
|
||||||
|
|
||||||
#include "wine/debug.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(dxerr);
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
const CHAR* resultA;
|
const CHAR* resultA;
|
||||||
|
@ -55,7 +51,6 @@ typedef struct {
|
||||||
const char * WINAPI DXGetErrorString8A(HRESULT hr)
|
const char * WINAPI DXGetErrorString8A(HRESULT hr)
|
||||||
{
|
{
|
||||||
unsigned int i, j, k = 0;
|
unsigned int i, j, k = 0;
|
||||||
TRACE("(0x%08x)\n", hr);
|
|
||||||
|
|
||||||
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
|
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
|
||||||
j = k + (i / 2);
|
j = k + (i / 2);
|
||||||
|
@ -74,7 +69,6 @@ const WCHAR * WINAPI DXGetErrorString8W(HRESULT hr)
|
||||||
{
|
{
|
||||||
static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 };
|
static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 };
|
||||||
unsigned int i, j, k = 0;
|
unsigned int i, j, k = 0;
|
||||||
TRACE("(0x%08x)\n", hr);
|
|
||||||
|
|
||||||
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
|
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
|
||||||
j = k + (i / 2);
|
j = k + (i / 2);
|
||||||
|
@ -92,7 +86,6 @@ const WCHAR * WINAPI DXGetErrorString8W(HRESULT hr)
|
||||||
const char * WINAPI DXGetErrorDescription8A(HRESULT hr)
|
const char * WINAPI DXGetErrorDescription8A(HRESULT hr)
|
||||||
{
|
{
|
||||||
unsigned int i, j, k = 0;
|
unsigned int i, j, k = 0;
|
||||||
TRACE("(0x%08x)\n", hr);
|
|
||||||
|
|
||||||
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
|
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
|
||||||
j = k + (i / 2);
|
j = k + (i / 2);
|
||||||
|
@ -111,7 +104,6 @@ const WCHAR * WINAPI DXGetErrorDescription8W(HRESULT hr)
|
||||||
{
|
{
|
||||||
static const WCHAR na[] = { 'n', '/', 'a', 0 };
|
static const WCHAR na[] = { 'n', '/', 'a', 0 };
|
||||||
unsigned int i, j, k = 0;
|
unsigned int i, j, k = 0;
|
||||||
TRACE("(0x%08x)\n", hr);
|
|
||||||
|
|
||||||
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
|
for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
|
||||||
j = k + (i / 2);
|
j = k + (i / 2);
|
||||||
|
@ -129,7 +121,6 @@ const WCHAR * WINAPI DXGetErrorDescription8W(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)
|
||||||
{
|
{
|
||||||
char msg[1024];
|
char msg[1024];
|
||||||
TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox);
|
|
||||||
|
|
||||||
if (bPopMsgBox) {
|
if (bPopMsgBox) {
|
||||||
snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s",
|
snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s",
|
||||||
|
@ -147,7 +138,6 @@ HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const cha
|
||||||
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)
|
||||||
{
|
{
|
||||||
WCHAR msg[1024];
|
WCHAR msg[1024];
|
||||||
TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox);
|
|
||||||
|
|
||||||
if (bPopMsgBox) {
|
if (bPopMsgBox) {
|
||||||
static const WCHAR format[] = { 'F','i','l','e',':',' ','%','s','\\','n','L','i','n',
|
static const WCHAR format[] = { 'F','i','l','e',':',' ','%','s','\\','n','L','i','n',
|
||||||
|
|
Loading…
Reference in New Issue