December 2008 - Wine-commits

Christian Costa : winedos: Document CMOS image bytes.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 3ae00dafe3fb0d0ed1cf1548305556f3f613020b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae00dafe3fb0d0ed1cf15483… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Dec 30 12:19:14 2008 +0100 winedos: Document CMOS image bytes. --- dlls/winedos/ioports.c | 72 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 64 insertions(+), 8 deletions(-) diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c index bd73af4..d03a4cd 100644 --- a/dlls/winedos/ioports.c +++ b/dlls/winedos/ioports.c @@ -72,14 +72,70 @@ static BYTE cmosaddress; */ static BYTE cmosimage[64] = { - 0x27, 0x34, 0x31, 0x47, 0x16, 0x15, 0x00, 0x01, - 0x04, 0x94, 0x26, 0x02, 0x50, 0x80, 0x00, 0x00, - 0x40, 0xb1, 0x00, 0x9c, 0x01, 0x80, 0x02, 0x00, - 0x1c, 0x00, 0x00, 0xad, 0x02, 0x10, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x03, 0x19, /* last 2 bytes are checksum */ - 0x00, 0x1c, 0x19, 0x81, 0x00, 0x0e, 0x00, 0x80, - 0x1b, 0x7b, 0x21, 0x00, 0x00, 0x00, 0x05, 0x5f + 0x27, /* 0x00: seconds */ + 0x34, /* 0X01: seconds alarm */ + 0x31, /* 0x02: minutes */ + 0x47, /* 0x03: minutes alarm */ + 0x16, /* 0x04: hour */ + 0x15, /* 0x05: hour alarm */ + 0x00, /* 0x06: week day */ + 0x01, /* 0x07: month day */ + 0x04, /* 0x08: month */ + 0x94, /* 0x09: year */ + 0x26, /* 0x0a: state A */ + 0x02, /* 0x0b: state B */ + 0x50, /* 0x0c: state C */ + 0x80, /* 0x0d: state D */ + 0x00, /* 0x0e: state diagnostic */ + 0x00, /* 0x0f: state state shutdown */ + 0x40, /* 0x10: floppy type */ + 0xb1, /* 0x11: reserved */ + 0x00, /* 0x12: HD type */ + 0x9c, /* 0x13: reserved */ + 0x01, /* 0x14: equipment */ + 0x80, /* 0x15: low base memory */ + 0x02, /* 0x16: high base memory (0x280 => 640KB) */ + 0x00, /* 0x17: low extended memory */ + 0x1c, /* 0x18: high extended memory (0x1c00 => 7MB) */ + 0x00, /* 0x19: HD 1 extended type byte */ + 0x00, /* 0x1a: HD 2 extended type byte */ + 0xad, /* 0x1b: reserved */ + 0x02, /* 0x1c: reserved */ + 0x10, /* 0x1d: reserved */ + 0x00, /* 0x1e: reserved */ + 0x00, /* 0x1f: installed features */ + 0x08, /* 0x20: HD 1 low cylinder number */ + 0x00, /* 0x21: HD 1 high cylinder number */ + 0x00, /* 0x22: HD 1 heads */ + 0x26, /* 0x23: HD 1 low pre-compensation start */ + 0x00, /* 0x24: HD 1 high pre-compensation start */ + 0x00, /* 0x25: HD 1 low landing zone */ + 0x00, /* 0x26: HD 1 high landing zone */ + 0x00, /* 0x27: HD 1 sectors */ + 0x00, /* 0x28: options 1 */ + 0x00, /* 0x29: reserved */ + 0x00, /* 0x2a: reserved */ + 0x00, /* 0x2b: options 2 */ + 0x00, /* 0x2c: options 3 */ + 0x3f, /* 0x2d: reserved */ + 0x03, /* 0x2e: low CMOS ram checksum */ + 0x19, /* 0x2f: high CMOS ram checksum */ + 0x00, /* 0x30: low extended memory byte */ + 0x1c, /* 0x31: high extended memory byte */ + 0x19, /* 0x32: century byte */ + 0x81, /* 0x33: setup information */ + 0x00, /* 0x34: CPU speed */ + 0x0e, /* 0x35: HD 2 low cylinder number */ + 0x00, /* 0x36: HD 2 high cylinder number */ + 0x80, /* 0x37: HD 2 heads */ + 0x1b, /* 0x38: HD 2 low pre-compensation start */ + 0x7b, /* 0x39: HD 2 high pre-compensation start */ + 0x21, /* 0x3a: HD 2 low landing zone */ + 0x00, /* 0x3b: HD 2 high landing zone */ + 0x00, /* 0x3c: HD 2 sectors */ + 0x00, /* 0x3d: reserved */ + 0x05, /* 0x3e: reserved */ + 0x5f /* 0x3f: reserved */ }; #if 0

1 0

Jacek Caban : mshtml: Wine Gecko 0.9.0 release.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 8d28f09d8a582ff499b5947a5a2d1cf2700fb259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d28f09d8a582ff499b5947a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 06:48:59 2008 +0100 mshtml: Wine Gecko 0.9.0 release. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem2.c | 78 ++++---- dlls/mshtml/mshtml_private.h | 22 ++ dlls/mshtml/mutation.c | 437 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsembed.c | 11 +- dlls/mshtml/nsevents.c | 5 +- dlls/mshtml/nsiface.idl | 218 ++++++++++++++++++--- dlls/mshtml/nsio.c | 67 +++++++- 8 files changed, 764 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d28f09d8a582ff499b59…

1 0

Henri Verbeet : configure: Check for gnutls_mac_get_key_size() instead of gnutls_transport_set_errno().
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 8c4a2978b281e9519a6581d859add636de4b42d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4a2978b281e9519a6581d85… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Tue Dec 30 09:45:20 2008 +0100 configure: Check for gnutls_mac_get_key_size() instead of gnutls_transport_set_errno(). --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 31858ad..98115be 100755 --- a/configure +++ b/configure @@ -13258,7 +13258,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -typeof(gnutls_transport_set_errno) *pfunc; +typeof(gnutls_mac_get_key_size) *pfunc; ; return 0; } diff --git a/configure.ac b/configure.ac index 6bbb4b9..784107e 100644 --- a/configure.ac +++ b/configure.ac @@ -938,7 +938,7 @@ then ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" AC_CHECK_HEADER(gnutls/gnutls.h, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_transport_set_errno) *pfunc;]])], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_mac_get_key_size) *pfunc;]])], [WINE_CHECK_SONAME(gnutls,gnutls_global_init, [AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])]) CPPFLAGS="$ac_save_CPPFLAGS"

1 0

Michael Stefaniuc : opengl32: make_opengl: Do not add explicit casts of function pointers to void pointers.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 161e90238a72b29cc7df982fad28c05ee7cd1929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161e90238a72b29cc7df982fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 30 01:07:27 2008 +0100 opengl32: make_opengl: Do not add explicit casts of function pointers to void pointers. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/opengl_ext.c | 2970 ++++++++++++++++++++++---------------------- 2 files changed, 1486 insertions(+), 1486 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=161e90238a72b29cc7df9…

1 0

Alexandre Julliard : opengl32: Define an enum for extensions to make diffs smaller when adding new extensions .
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 03a83c49db9a2a140c705976d7255f4895cb57a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a83c49db9a2a140c705976d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 12:20:47 2008 +0100 opengl32: Define an enum for extensions to make diffs smaller when adding new extensions. --- dlls/opengl32/make_opengl | 16 +- dlls/opengl32/opengl_ext.c | 4466 +++++++++++++++++++++++++++++--------------- 2 files changed, 2988 insertions(+), 1494 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03a83c49db9a2a140c705…

1 0

Andrew Nguyen : setupapi: Stub the SetupDiDestroyClassImageList function.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 33197eaa8de50139b35c265c456352b156b7401e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33197eaa8de50139b35c265c4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Dec 29 11:43:08 2008 -0600 setupapi: Stub the SetupDiDestroyClassImageList function. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 2d06200..7fa536f 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -297,7 +297,7 @@ @ stub SetupDiDeleteDeviceInterfaceData @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey -@ stub SetupDiDestroyClassImageList +@ stdcall SetupDiDestroyClassImageList(ptr) @ stdcall SetupDiDestroyDeviceInfoList(long) @ stub SetupDiDestroyDriverInfoList @ stub SetupDiDrawMiniIcon diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index e4defc5..8571ba7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -211,6 +211,15 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, } /*********************************************************************** + * SetupDiDestroyClassImageList (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassListImageData) +{ + FIXME("(%p) stub\n", ClassListImageData); + return TRUE; +} + +/*********************************************************************** * SetupPromptForDiskA (SETUPAPI.@) */ UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskName,

1 0

Andrew Nguyen : cfgmgr32: Forward and stub CM_Create_DevNodeA/W.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: d46ffb4b6fb2b16e2a2acd152c9d7eb5736f70b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46ffb4b6fb2b16e2a2acd152… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Dec 29 11:43:12 2008 -0600 cfgmgr32: Forward and stub CM_Create_DevNodeA/W. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ include/cfgmgr32.h | 3 +++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 4d3b3b3..f080e7d 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -9,8 +9,8 @@ @ stub CM_Add_Res_Des_Ex @ stdcall CM_Connect_MachineA(str ptr) setupapi.CM_Connect_MachineA @ stdcall CM_Connect_MachineW(wstr ptr) setupapi.CM_Connect_MachineW -@ stub CM_Create_DevNodeA -@ stub CM_Create_DevNodeW +@ stdcall CM_Create_DevNodeA(ptr str long long) setupapi.CM_Create_DevNodeA +@ stdcall CM_Create_DevNodeW(ptr wstr long long) setupapi.CM_Create_DevNodeW @ stub CM_Create_DevNode_ExA @ stub CM_Create_DevNode_ExW @ stub CM_Create_Range_List diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 7fa536f..cd3c856 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -20,8 +20,8 @@ @ stub CM_Add_Res_Des_Ex @ stdcall CM_Connect_MachineA(str ptr) @ stdcall CM_Connect_MachineW(wstr ptr) -@ stub CM_Create_DevNodeA -@ stub CM_Create_DevNodeW +@ stdcall CM_Create_DevNodeA(ptr str long long) +@ stdcall CM_Create_DevNodeW(ptr wstr long long) @ stub CM_Create_DevNode_ExA @ stub CM_Create_DevNode_ExW @ stub CM_Create_Range_List diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 8571ba7..89b02eb 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -70,6 +70,24 @@ CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR name, PHMACHINE machine) } /*********************************************************************** + * CM_Create_DevNodeA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Create_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, DEVINST dnParent, ULONG ulFlags) +{ + FIXME("(%p %s 0x%08x 0x%08x) stub\n", pdnDevInst, pDeviceID, dnParent, ulFlags); + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Create_DevNodeW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Create_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, DEVINST dnParent, ULONG ulFlags) +{ + FIXME("(%p %s 0x%08x 0x%08x) stub\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags); + return CR_SUCCESS; +} + +/*********************************************************************** * CM_Disconnect_Machine (SETUPAPI.@) */ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 9dedc4e..9e99985 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -117,6 +117,9 @@ extern "C" { CMAPI CONFIGRET WINAPI CM_Connect_MachineA(PCSTR,PHMACHINE); CMAPI CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR,PHMACHINE); #define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine) +CMAPI CONFIGRET WINAPI CM_Create_DevNodeA(PDEVINST,DEVINSTID_A,DEVINST,ULONG); +CMAPI CONFIGRET WINAPI CM_Create_DevNodeW(PDEVINST,DEVINSTID_W,DEVINST,ULONG); +#define CM_Create_DevNode WINELIB_NAME_AW(CM_Create_DevNode) CMAPI CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST,PSTR,ULONG,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST,PWSTR,ULONG,ULONG);

1 0

Andrew Nguyen : cfgmgr32: Forward and stub CM_Connect_MachineA.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 3dcac86e5341849f85c3ba22b0786a994fb9f388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dcac86e5341849f85c3ba22b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Dec 29 11:43:00 2008 -0600 cfgmgr32: Forward and stub CM_Connect_MachineA. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 3db32c0..4d3b3b3 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -7,7 +7,7 @@ @ stub CM_Add_Range @ stub CM_Add_Res_Des @ stub CM_Add_Res_Des_Ex -@ stub CM_Connect_MachineA +@ stdcall CM_Connect_MachineA(str ptr) setupapi.CM_Connect_MachineA @ stdcall CM_Connect_MachineW(wstr ptr) setupapi.CM_Connect_MachineW @ stub CM_Create_DevNodeA @ stub CM_Create_DevNodeW diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index d08b4d3..2d06200 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -18,7 +18,7 @@ @ stub CM_Add_Range @ stub CM_Add_Res_Des @ stub CM_Add_Res_Des_Ex -@ stub CM_Connect_MachineA +@ stdcall CM_Connect_MachineA(str ptr) @ stdcall CM_Connect_MachineW(wstr ptr) @ stub CM_Create_DevNodeA @ stub CM_Create_DevNodeW diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 9a56fd0..e4defc5 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -52,6 +52,15 @@ DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 ) } /*********************************************************************** + * CM_Connect_MachineA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Connect_MachineA(PCSTR name, PHMACHINE machine) +{ + FIXME("(%s %p) stub\n", name, machine); + return CR_ACCESS_DENIED; +} + +/*********************************************************************** * CM_Connect_MachineW (SETUPAPI.@) */ CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR name, PHMACHINE machine)

1 0

Henri Verbeet : d3d9: Use separate codepaths for failure and NULL return values in GetVertexShader () / GetPixelShader().
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 8da71ca6a66d4543e0f51e83196f7429413bd3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da71ca6a66d4543e0f51e831… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 16:31:22 2008 +0100 d3d9: Use separate codepaths for failure and NULL return values in GetVertexShader() / GetPixelShader(). --- dlls/d3d9/pixelshader.c | 20 +++++++++++++++----- dlls/d3d9/vertexshader.c | 19 ++++++++++++++----- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 059116a..dddda28 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -170,11 +170,21 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9EX iface, ID EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &object); - if (hrc == D3D_OK && object != NULL) { - hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)ppShader); - IWineD3DPixelShader_Release(object); - } else { - *ppShader = NULL; + if (SUCCEEDED(hrc)) + { + if (object) + { + hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)ppShader); + IWineD3DPixelShader_Release(object); + } + else + { + *ppShader = NULL; + } + } + else + { + WARN("(%p) : Call to IWineD3DDevice_GetPixelShader failed %u (device %p)\n", This, hrc, This->WineD3DDevice); } LeaveCriticalSection(&d3d9_cs); diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 6172225..6478b68 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -166,11 +166,20 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9EX iface, I TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice); EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &pShader); - if(hrc == D3D_OK && pShader != NULL){ - hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader); - IWineD3DVertexShader_Release(pShader); - } else { - *ppShader = NULL; + if (SUCCEEDED(hrc)) + { + if (pShader) + { + hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader); + IWineD3DVertexShader_Release(pShader); + } + else + { + *ppShader = NULL; + } + } + else + { WARN("(%p) : Call to IWineD3DDevice_GetVertexShader failed %u (device %p)\n", This, hrc, This->WineD3DDevice); } LeaveCriticalSection(&d3d9_cs);

1 0

Henri Verbeet : d3d: Correct some debug levels.
by Alexandre Julliard 30 Dec '08

30 Dec '08

Module: wine Branch: master Commit: 007c648c20769af757ba0926f920965cbac5997b URL: http://source.winehq.org/git/wine.git/?a=commit;h=007c648c20769af757ba0926f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 16:31:22 2008 +0100 d3d: Correct some debug levels. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/cubetexture.c | 4 ++-- dlls/d3d9/query.c | 4 ++-- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/texture.c | 4 ++-- dlls/d3d9/volumetexture.c | 4 ++-- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6484225..96ce450 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1113,7 +1113,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_EndStateBlock(LPDIRECT3DDEVICE8 iface EnterCriticalSection(&d3d8_cs); hr = IWineD3DDevice_EndStateBlock(This->WineD3DDevice , &wineD3DStateBlock); if (hr != D3D_OK) { - FIXME("IWineD3DDevice_EndStateBlock returned an error\n"); + WARN("IWineD3DDevice_EndStateBlock returned an error\n"); LeaveCriticalSection(&d3d8_cs); return hr; } diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index bf88995..aeb8893 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -348,7 +348,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(LPDIRECT3DDEVICE9EX ifac object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (NULL == object) { - FIXME("(%p) allocation of CubeTexture failed\n", This); + ERR("(%p) allocation of CubeTexture failed\n", This); return D3DERR_OUTOFVIDEOMEMORY; } object->lpVtbl = &Direct3DCubeTexture9_Vtbl; @@ -362,7 +362,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(LPDIRECT3DDEVICE9EX ifac if (hr != D3D_OK){ /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateCubeTexture failed\n", This); + WARN("(%p) call to IWineD3DDevice_CreateCubeTexture failed\n", This); HeapFree(GetProcessHeap(), 0, object); } else { IDirect3DDevice9Ex_AddRef(iface); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 9a15164..6e4b20a 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -163,7 +163,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9EX iface, D3DQU /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DQuery9Impl)); if (NULL == object) { - FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); + ERR("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); return D3DERR_OUTOFVIDEOMEMORY; } @@ -176,7 +176,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9EX iface, D3DQU if (FAILED(hr)) { /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateQuery failed\n", This); + WARN("(%p) call to IWineD3DDevice_CreateQuery failed\n", This); HeapFree(GetProcessHeap(), 0, object); } else { IDirect3DDevice9Ex_AddRef(iface); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 30b42c5..bf3f598 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -175,7 +175,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(LPDIRECT3DDEVICE9EX iface, I hr=IWineD3DDevice_EndStateBlock(This->WineD3DDevice,&wineD3DStateBlock); LeaveCriticalSection(&d3d9_cs); if(hr!= D3D_OK){ - FIXME("IWineD3DDevice_EndStateBlock returned an error\n"); + WARN("IWineD3DDevice_EndStateBlock returned an error\n"); return hr; } /* allocate a new IDirectD3DStateBlock */ diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 71e1be3..9c507ef 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -339,7 +339,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9EX iface, U object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DTexture9Impl)); if (NULL == object) { - FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); + ERR("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); return D3DERR_OUTOFVIDEOMEMORY; } @@ -353,7 +353,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9EX iface, U if (FAILED(hrc)) { /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateTexture failed\n", This); + WARN("(%p) call to IWineD3DDevice_CreateTexture failed\n", This); HeapFree(GetProcessHeap(), 0, object); } else { IDirect3DDevice9Ex_AddRef(iface); diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 3069771..303675b 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -252,7 +252,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(LPDIRECT3DDEVICE9EX if /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVolumeTexture9Impl)); if (NULL == object) { - FIXME("(%p) allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n", This); + ERR("(%p) allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n", This); return D3DERR_OUTOFVIDEOMEMORY; } @@ -266,7 +266,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(LPDIRECT3DDEVICE9EX if if (hrc != D3D_OK) { /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateVolumeTexture failed\n", This); + WARN("(%p) call to IWineD3DDevice_CreateVolumeTexture failed\n", This); HeapFree(GetProcessHeap(), 0, object); } else { IDirect3DDevice9Ex_AddRef(iface); diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 90b1221..7841ca3 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -298,7 +298,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_GetLevelDesc(IWineD3DCubeTexture * TRACE("(%p) level (%d)\n", This, Level); return IWineD3DSurface_GetDesc(This->surfaces[0][Level], pDesc); } - FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); + WARN("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 36fbcba..91aecad 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2984,7 +2984,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D * * TODO: Test how this affects rendering */ - FIXME("Too many concurrently active lights\n"); + WARN("Too many concurrently active lights\n"); return WINED3D_OK; } @@ -4738,7 +4738,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW IWineD3DStateBlockImpl *object = This->updateStateBlock; if (!This->isRecordingState) { - FIXME("(%p) not recording! returning error\n", This); + WARN("(%p) not recording! returning error\n", This); *ppStateBlock = NULL; return WINED3DERR_INVALIDCALL; } @@ -5137,7 +5137,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * * without an index buffer set. (The first time at least...) * D3D8 simply dies, but I doubt it can do much harm to return * D3DERR_INVALIDCALL there as well. */ - ERR("(%p) : Called without a valid index buffer set, returning WINED3DERR_INVALIDCALL\n", This); + WARN("(%p) : Called without a valid index buffer set, returning WINED3DERR_INVALIDCALL\n", This); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 71fb455..ac3063a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -303,7 +303,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, U TRACE("(%p) Level (%d)\n", This, Level); return IWineD3DSurface_GetDesc(This->surfaces[Level], pDesc); } - FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); + WARN("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 9da4c95..6fd2ff0 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -244,7 +244,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTextu TRACE("(%p) Level (%d)\n", This, Level); return IWineD3DVolume_GetDesc(This->volumes[Level], pDesc); } else { - FIXME("(%p) Level (%d)\n", This, Level); + WARN("(%p) Level (%d)\n", This, Level); } return WINED3D_OK; } @@ -255,7 +255,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTex IWineD3DVolume_AddRef(*ppVolumeLevel); TRACE("(%p) -> level(%d) returning volume@%p\n", This, Level, *ppVolumeLevel); } else { - FIXME("(%p) Level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); + WARN("(%p) Level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); return WINED3DERR_INVALIDCALL; } return WINED3D_OK;

1 0