Skip to content

W
wine-cw
Commit e46a0c47 authored by Robert Reif's avatar Robert Reif Committed by Alexandre Julliard
Browse files
Options

Added more error codes to dxerr8 and dxerr9 which were extracted from

MinGW win32api-3.3 file dxerr.c written by Filip Navara <xnavara@volny.cz>.
parent 457ece15
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 45 deletions
dlls/dxerr8/dxerr8.c
View file @ e46a0c47
/* /*
* DirectX 8 error routines * DirectX 8 error routines
* *
* Copyright 2004 Robert Reif * Copyright 2004-2005 Robert Reif
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
...@@ -18,12 +18,6 @@ ...@@ -18,12 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* TODO:
* Add error codes for D3D8, D3DX8, DDRAW, DPLAY8, DMUSIC, DINPUT and DSHOW.
* Sort list for faster lookup.
*/
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
...@@ -36,6 +30,10 @@ ...@@ -36,6 +30,10 @@
#include "mmsystem.h" #include "mmsystem.h"
#include "dsound.h" #include "dsound.h"
#include "dmerror.h"
#include "ddraw.h"
#include "dinput.h"
#include "vfwmsgs.h"
#include "dxerr8.h" #include "dxerr8.h"
...@@ -55,12 +53,17 @@ typedef struct { ...@@ -55,12 +53,17 @@ typedef struct {
const char * WINAPI DXGetErrorString8A(HRESULT hr) const char * WINAPI DXGetErrorString8A(HRESULT hr)
{ {
unsigned int i; unsigned int i, j, k = 0;
TRACE("(0x%08lx)\n", hr); TRACE("(0x%08lx)\n", hr);
for (i = 0; i < sizeof(info)/sizeof(info[0]); i++) { for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
if (hr == info[i].hr) j = k + (i / 2);
return info[i].resultA; if (hr == info[j].hr)
return info[j].resultA;
if ((unsigned int)hr > (unsigned int)info[j].hr) {
k = j + 1;
i--;
}
} }
return "Unknown"; return "Unknown";
...@@ -69,12 +72,16 @@ const char * WINAPI DXGetErrorString8A(HRESULT hr) ...@@ -69,12 +72,16 @@ const char * WINAPI DXGetErrorString8A(HRESULT hr)
const WCHAR * WINAPI DXGetErrorString8W(HRESULT hr) 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; unsigned int i, j, k = 0;
TRACE("(0x%08lx)\n", hr); TRACE("(0x%08lx)\n", hr);
for (i = 0; i < sizeof(info)/sizeof(info[0]); i++) { for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
if (hr == info[i].hr) { j = k + (i / 2);
return info[i].resultW; if (hr == info[j].hr)
return info[j].resultW;
if ((unsigned int)hr > (unsigned int)info[j].hr) {
k = j + 1;
i--;
} }
} }
...@@ -83,12 +90,17 @@ const WCHAR * WINAPI DXGetErrorString8W(HRESULT hr) ...@@ -83,12 +90,17 @@ const WCHAR * WINAPI DXGetErrorString8W(HRESULT hr)
const char * WINAPI DXGetErrorDescription8A(HRESULT hr) const char * WINAPI DXGetErrorDescription8A(HRESULT hr)
{ {
unsigned int i; unsigned int i, j, k = 0;
TRACE("(0x%08lx)\n", hr); TRACE("(0x%08lx)\n", hr);
for (i = 0; i < sizeof(info)/sizeof(info[0]); i++) { for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
if (hr == info[i].hr) j = k + (i / 2);
return info[i].descriptionA; if (hr == info[j].hr)
return info[j].descriptionA;
if ((unsigned int)hr > (unsigned int)info[j].hr) {
k = j + 1;
i--;
}
} }
return "n/a"; return "n/a";
...@@ -97,12 +109,16 @@ const char * WINAPI DXGetErrorDescription8A(HRESULT hr) ...@@ -97,12 +109,16 @@ const char * WINAPI DXGetErrorDescription8A(HRESULT hr)
const WCHAR * WINAPI DXGetErrorDescription8W(HRESULT hr) const WCHAR * WINAPI DXGetErrorDescription8W(HRESULT hr)
{ {
static const WCHAR na[] = { 'n', '/', 'a', 0 }; static const WCHAR na[] = { 'n', '/', 'a', 0 };
unsigned int i; unsigned int i, j, k = 0;
TRACE("(0x%08lx)\n", hr); TRACE("(0x%08lx)\n", hr);
for (i = 0; i < sizeof(info)/sizeof(info[0]); i++) { for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
if (hr == info[i].hr) { j = k + (i / 2);
return info[i].descriptionW; if (hr == info[j].hr)
return info[j].descriptionW;
if ((unsigned int)hr > (unsigned int)info[j].hr) {
k = j + 1;
i--;
} }
} }
......
dlls/dxerr8/errors.h
View file @ e46a0c47
This source diff could not be displayed because it is too large. You can view the blob instead.
dlls/dxerr9/dxerr9.c
View file @ e46a0c47
...@@ -18,12 +18,6 @@ ...@@ -18,12 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* TODO:
* Add error codes for D3D9, D3DX9, D3D8, D3DX8, DDRAW, DPLAY8, DMUSIC, DINPUT and DSHOW.
* Sort list for faster lookup.
*/
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
...@@ -35,6 +29,14 @@ ...@@ -35,6 +29,14 @@
#include "winnls.h" #include "winnls.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "dmerror.h"
#include "ddraw.h"
#include "dinput.h"
#include "vfwmsgs.h"
#include "mmstream.h"
#include "dplay8.h"
#include "dxfile.h"
#include "d3d9.h"
#include "dsound.h" #include "dsound.h"
#include "dxerr9.h" #include "dxerr9.h"
...@@ -55,12 +57,17 @@ typedef struct { ...@@ -55,12 +57,17 @@ typedef struct {
const char * WINAPI DXGetErrorString9A(HRESULT hr) const char * WINAPI DXGetErrorString9A(HRESULT hr)
{ {
unsigned int i; unsigned int i, j, k = 0;
TRACE("(0x%08lx)\n", hr); TRACE("(0x%08lx)\n", hr);
for (i = 0; i < sizeof(info)/sizeof(info[0]); i++) { for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
if (hr == info[i].hr) j = k + (i / 2);
return info[i].resultA; if (hr == info[j].hr)
return info[j].resultA;
if ((unsigned int)hr > (unsigned int)info[j].hr) {
k = j + 1;
i--;
}
} }
return "Unknown"; return "Unknown";
...@@ -69,12 +76,16 @@ const char * WINAPI DXGetErrorString9A(HRESULT hr) ...@@ -69,12 +76,16 @@ const char * WINAPI DXGetErrorString9A(HRESULT hr)
const WCHAR * WINAPI DXGetErrorString9W(HRESULT hr) const WCHAR * WINAPI DXGetErrorString9W(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; unsigned int i, j, k = 0;
TRACE("(0x%08lx)\n", hr); TRACE("(0x%08lx)\n", hr);
for (i = 0; i < sizeof(info)/sizeof(info[0]); i++) { for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
if (hr == info[i].hr) { j = k + (i / 2);
return info[i].resultW; if (hr == info[j].hr)
return info[j].resultW;
if ((unsigned int)hr > (unsigned int)info[j].hr) {
k = j + 1;
i--;
} }
} }
...@@ -83,12 +94,17 @@ const WCHAR * WINAPI DXGetErrorString9W(HRESULT hr) ...@@ -83,12 +94,17 @@ const WCHAR * WINAPI DXGetErrorString9W(HRESULT hr)
const char * WINAPI DXGetErrorDescription9A(HRESULT hr) const char * WINAPI DXGetErrorDescription9A(HRESULT hr)
{ {
unsigned int i; unsigned int i, j, k = 0;
TRACE("(0x%08lx)\n", hr); TRACE("(0x%08lx)\n", hr);
for (i = 0; i < sizeof(info)/sizeof(info[0]); i++) { for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
if (hr == info[i].hr) j = k + (i / 2);
return info[i].descriptionA; if (hr == info[j].hr)
return info[j].descriptionA;
if ((unsigned int)hr > (unsigned int)info[j].hr) {
k = j + 1;
i--;
}
} }
return "n/a"; return "n/a";
...@@ -97,12 +113,16 @@ const char * WINAPI DXGetErrorDescription9A(HRESULT hr) ...@@ -97,12 +113,16 @@ const char * WINAPI DXGetErrorDescription9A(HRESULT hr)
const WCHAR * WINAPI DXGetErrorDescription9W(HRESULT hr) const WCHAR * WINAPI DXGetErrorDescription9W(HRESULT hr)
{ {
static const WCHAR na[] = { 'n', '/', 'a', 0 }; static const WCHAR na[] = { 'n', '/', 'a', 0 };
unsigned int i; unsigned int i, j, k = 0;
TRACE("(0x%08lx)\n", hr); TRACE("(0x%08lx)\n", hr);
for (i = 0; i < sizeof(info)/sizeof(info[0]); i++) { for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) {
if (hr == info[i].hr) { j = k + (i / 2);
return info[i].descriptionW; if (hr == info[j].hr)
return info[j].descriptionW;
if ((unsigned int)hr > (unsigned int)info[j].hr) {
k = j + 1;
i--;
} }
} }
......
dlls/dxerr9/errors.h
View file @ e46a0c47
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment