Wine-Commits

wine-commits@list.winehq.org

May 2008

4 participants
722 discussions

Alexandre Julliard : dxerr8: Don' t use Wine debugging macros in static libraries.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 7342508191fb3f0bfd8a750a23c131c82b4c1266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7342508191fb3f0bfd8a750a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 30 14:24:40 2008 +0200 dxerr8: Don't use Wine debugging macros in static libraries. --- dlls/dxerr8/dxerr8.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index 69d24e6..534f632 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -38,10 +38,6 @@ #include "dxerr8.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxerr); - typedef struct { HRESULT hr; const CHAR* resultA; @@ -55,7 +51,6 @@ typedef struct { const char * WINAPI DXGetErrorString8A(HRESULT hr) { unsigned int i, j, k = 0; - TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; 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 }; unsigned int i, j, k = 0; - TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -92,7 +86,6 @@ const WCHAR * WINAPI DXGetErrorString8W(HRESULT hr) const char * WINAPI DXGetErrorDescription8A(HRESULT hr) { unsigned int i, j, k = 0; - TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -111,7 +104,6 @@ const WCHAR * WINAPI DXGetErrorDescription8W(HRESULT hr) { static const WCHAR na[] = { 'n', '/', 'a', 0 }; unsigned int i, j, k = 0; - TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; 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) { char msg[1024]; - TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); if (bPopMsgBox) { 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) { WCHAR msg[1024]; - TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); if (bPopMsgBox) { static const WCHAR format[] = { 'F','i','l','e',':',' ','%','s','\\','n','L','i','n',

1 0

Alexandre Julliard : makefiles: List the static libraries as normal imports instead of extra libs.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: dad21bbcbfdd4811c5a90d0c695c34c0a8a3a1ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad21bbcbfdd4811c5a90d0c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 30 14:23:55 2008 +0200 makefiles: List the static libraries as normal imports instead of extra libs. --- dlls/advapi32/tests/Makefile.in | 3 +-- dlls/amstream/Makefile.in | 3 +-- dlls/atl/Makefile.in | 3 +-- dlls/avifil32/Makefile.in | 3 +-- dlls/browseui/Makefile.in | 3 +-- dlls/browseui/tests/Makefile.in | 3 +-- dlls/comcat/Makefile.in | 3 +-- dlls/comcat/tests/Makefile.in | 3 +-- dlls/comdlg32/Makefile.in | 3 +-- dlls/d3d10/Makefile.in | 3 +-- dlls/d3d8/Makefile.in | 3 +-- dlls/d3d8/tests/Makefile.in | 3 +-- dlls/d3d9/Makefile.in | 3 +-- dlls/d3d9/tests/Makefile.in | 3 +-- dlls/d3drm/tests/Makefile.in | 3 +-- dlls/d3dx8/Makefile.in | 3 +-- dlls/d3dx8/tests/Makefile.in | 3 +-- dlls/d3dxof/Makefile.in | 3 +-- dlls/ddraw/Makefile.in | 3 +-- dlls/ddraw/tests/Makefile.in | 3 +-- dlls/ddrawex/Makefile.in | 3 +-- dlls/devenum/Makefile.in | 3 +-- dlls/dinput/Makefile.in | 3 +-- dlls/dinput/tests/Makefile.in | 3 +-- dlls/dinput8/Makefile.in | 3 +-- dlls/dmband/Makefile.in | 3 +-- dlls/dmcompos/Makefile.in | 3 +-- dlls/dmime/Makefile.in | 3 +-- dlls/dmloader/Makefile.in | 3 +-- dlls/dmscript/Makefile.in | 3 +-- dlls/dmstyle/Makefile.in | 3 +-- dlls/dmsynth/Makefile.in | 3 +-- dlls/dmusic/Makefile.in | 3 +-- dlls/dmusic32/Makefile.in | 3 +-- dlls/dplayx/Makefile.in | 3 +-- dlls/dplayx/tests/Makefile.in | 3 +-- dlls/dpnet/Makefile.in | 3 +-- dlls/dsound/Makefile.in | 3 +-- dlls/dsound/tests/Makefile.in | 3 +-- dlls/dswave/Makefile.in | 3 +-- dlls/dxdiagn/Makefile.in | 3 +-- dlls/gdiplus/Makefile.in | 3 +-- dlls/hhctrl.ocx/Makefile.in | 3 +-- dlls/hlink/Makefile.in | 3 +-- dlls/hlink/tests/Makefile.in | 3 +-- dlls/inetcomm/Makefile.in | 3 +-- dlls/inetcomm/tests/Makefile.in | 3 +-- dlls/infosoft/Makefile.in | 3 +-- dlls/inseng/Makefile.in | 3 +-- dlls/itss/Makefile.in | 3 +-- dlls/itss/tests/Makefile.in | 3 +-- dlls/jscript/tests/Makefile.in | 3 +-- dlls/mapi32/Makefile.in | 3 +-- dlls/mapi32/tests/Makefile.in | 3 +-- dlls/mlang/Makefile.in | 3 +-- dlls/mlang/tests/Makefile.in | 3 +-- dlls/mountmgr.sys/Makefile.in | 4 ++-- dlls/mscoree/Makefile.in | 3 +-- dlls/msdmo/Makefile.in | 3 +-- dlls/msftedit/Makefile.in | 3 +-- dlls/mshtml/Makefile.in | 3 +-- dlls/mshtml/tests/Makefile.in | 3 +-- dlls/msi/Makefile.in | 3 +-- dlls/msi/tests/Makefile.in | 3 +-- dlls/msimtf/Makefile.in | 3 +-- dlls/msisys.ocx/Makefile.in | 3 +-- dlls/msxml3/Makefile.in | 4 ++-- dlls/msxml3/tests/Makefile.in | 3 +-- dlls/objsel/Makefile.in | 3 +-- dlls/odbccp32/Makefile.in | 3 +-- dlls/ole32/Makefile.in | 3 +-- dlls/ole32/tests/Makefile.in | 3 +-- dlls/oleaut32/Makefile.in | 3 +-- dlls/oleaut32/tests/Makefile.in | 3 +-- dlls/pstorec/Makefile.in | 3 +-- dlls/qcap/Makefile.in | 3 +-- dlls/qedit/Makefile.in | 3 +-- dlls/qedit/tests/Makefile.in | 3 +-- dlls/qmgr/Makefile.in | 3 +-- dlls/quartz/Makefile.in | 3 +-- dlls/quartz/tests/Makefile.in | 3 +-- dlls/query/Makefile.in | 3 +-- dlls/riched20/Makefile.in | 3 +-- dlls/rpcrt4/Makefile.in | 3 +-- dlls/rpcrt4/tests/Makefile.in | 3 +-- dlls/setupapi/Makefile.in | 3 +-- dlls/shdocvw/Makefile.in | 3 +-- dlls/shdocvw/tests/Makefile.in | 3 +-- dlls/shell32/Makefile.in | 3 +-- dlls/shell32/tests/Makefile.in | 3 +-- dlls/shlwapi/Makefile.in | 3 +-- dlls/shlwapi/tests/Makefile.in | 3 +-- dlls/urlmon/Makefile.in | 3 +-- dlls/urlmon/tests/Makefile.in | 3 +-- dlls/winealsa.drv/Makefile.in | 4 ++-- dlls/wineaudioio.drv/Makefile.in | 4 ++-- dlls/winecoreaudio.drv/Makefile.in | 4 ++-- dlls/wined3d/Makefile.in | 3 +-- dlls/wineesd.drv/Makefile.in | 4 ++-- dlls/winejack.drv/Makefile.in | 3 +-- dlls/winenas.drv/Makefile.in | 4 ++-- dlls/wineoss.drv/Makefile.in | 3 +-- programs/oleview/Makefile.in | 3 +-- programs/wineboot/Makefile.in | 3 +-- programs/winecfg/Makefile.in | 3 +-- programs/winefile/Makefile.in | 3 +-- programs/winemenubuilder/Makefile.in | 3 +-- 107 files changed, 114 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dad21bbcbfdd4811c5a90…

1 0

Jump to page: