Skip to content

W
wine-winehq
Commit dd03cc19 authored by Dimitrie O. Paun's avatar Dimitrie O. Paun Committed by Alexandre Julliard
Browse files
Options

Make use of the DEFAULT_DEBUG_CHANNEL where appropriate.

Use the default version of FIXME, ERR, WARN, TRACE for the default channel.
parent 0106f85e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 657 additions and 679 deletions
dlls/advapi32/crypt.c
View file @ dd03cc19
......@@ -26,7 +26,7 @@ BOOL WINAPI
CryptAcquireContextA( HCRYPTPROV *phProv, LPCSTR pszContainer,
LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags)
{
FIXME_(advapi)("(%p, %s, %s, %ld, %08lx): stub!\n", phProv, pszContainer,
FIXME("(%p, %s, %s, %ld, %08lx): stub!\n", phProv, pszContainer,
pszProvider, dwProvType, dwFlags);
return FALSE;
}
......@@ -37,8 +37,7 @@ CryptAcquireContextA( HCRYPTPROV *phProv, LPCSTR pszContainer,
BOOL WINAPI
CryptSetKeyParam( HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags)
{
FIXME_(advapi)("(%lx, %lx, %p, %lx): stub!\n",
hKey, dwParam, pbData, dwFlags);
FIXME("(%lx, %lx, %p, %lx): stub!\n", hKey, dwParam, pbData, dwFlags);
return FALSE;
}
dlls/advapi32/security.c
View file @ dd03cc19
......@@ -11,7 +11,7 @@
#include "ntsecapi.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(advapi)
DEFAULT_DEBUG_CHANNEL(advapi)
DECLARE_DEBUG_CHANNEL(security)
......@@ -499,7 +499,7 @@ BOOL WINAPI
MakeSelfRelativeSD( PSECURITY_DESCRIPTOR lpabssecdesc,
PSECURITY_DESCRIPTOR lpselfsecdesc, LPDWORD lpbuflen )
{
FIXME_(advapi)("(%p,%p,%p),stub!\n",lpabssecdesc,lpselfsecdesc,lpbuflen);
FIXME("(%p,%p,%p),stub!\n",lpabssecdesc,lpselfsecdesc,lpbuflen);
return TRUE;
}
......@@ -509,7 +509,7 @@ MakeSelfRelativeSD( PSECURITY_DESCRIPTOR lpabssecdesc,
BOOL WINAPI GetSecurityDescriptorControl ( PSECURITY_DESCRIPTOR pSecurityDescriptor,
PSECURITY_DESCRIPTOR_CONTROL pControl, LPDWORD lpdwRevision)
{ FIXME_(advapi)("(%p,%p,%p),stub!\n",pSecurityDescriptor,pControl,lpdwRevision);
{ FIXME("(%p,%p,%p),stub!\n",pSecurityDescriptor,pControl,lpdwRevision);
return 1;
}
......@@ -535,8 +535,8 @@ BOOL WINAPI GetSecurityDescriptorControl ( PSECURITY_DESCRIPTOR pSecurityDescri
BOOL WINAPI
LookupPrivilegeValueW( LPCWSTR lpSystemName, LPCWSTR lpName, LPVOID lpLuid )
{
FIXME_(advapi)("(%s,%s,%p): stub\n",debugstr_w(lpSystemName),
debugstr_w(lpName), lpLuid);
FIXME("(%s,%s,%p): stub\n",debugstr_w(lpSystemName),
debugstr_w(lpName), lpLuid);
return TRUE;
}
......@@ -567,7 +567,7 @@ GetFileSecurityA( LPCSTR lpFileName,
PSECURITY_DESCRIPTOR pSecurityDescriptor,
DWORD nLength, LPDWORD lpnLengthNeeded )
{
FIXME_(advapi)("(%s) : stub\n", debugstr_a(lpFileName));
FIXME("(%s) : stub\n", debugstr_a(lpFileName));
return TRUE;
}
......@@ -591,7 +591,7 @@ GetFileSecurityW( LPCWSTR lpFileName,
PSECURITY_DESCRIPTOR pSecurityDescriptor,
DWORD nLength, LPDWORD lpnLengthNeeded )
{
FIXME_(advapi)("(%s) : stub\n", debugstr_w(lpFileName) );
FIXME("(%s) : stub\n", debugstr_w(lpFileName) );
return TRUE;
}
......@@ -641,7 +641,7 @@ BOOL WINAPI SetFileSecurityA( LPCSTR lpFileName,
SECURITY_INFORMATION RequestedInformation,
PSECURITY_DESCRIPTOR pSecurityDescriptor)
{
FIXME_(advapi)("(%s) : stub\n", debugstr_a(lpFileName));
FIXME("(%s) : stub\n", debugstr_a(lpFileName));
return TRUE;
}
......@@ -659,7 +659,7 @@ SetFileSecurityW( LPCWSTR lpFileName,
SECURITY_INFORMATION RequestedInformation,
PSECURITY_DESCRIPTOR pSecurityDescriptor )
{
FIXME_(advapi)("(%s) : stub\n", debugstr_w(lpFileName) );
FIXME("(%s) : stub\n", debugstr_w(lpFileName) );
return TRUE;
}
......@@ -672,7 +672,7 @@ SetFileSecurityW( LPCWSTR lpFileName,
BOOL WINAPI
QueryWindows31FilesMigration( DWORD x1 )
{
FIXME_(advapi)("(%ld):stub\n",x1);
FIXME("(%ld):stub\n",x1);
return TRUE;
}
......@@ -689,7 +689,7 @@ BOOL WINAPI
SynchronizeWindows31FilesAndWindowsNTRegistry( DWORD x1, DWORD x2, DWORD x3,
DWORD x4 )
{
FIXME_(advapi)("(0x%08lx,0x%08lx,0x%08lx,0x%08lx):stub\n",x1,x2,x3,x4);
FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx):stub\n",x1,x2,x3,x4);
return TRUE;
}
......@@ -708,9 +708,8 @@ LsaOpenPolicy(PLSA_UNICODE_STRING SystemName,
ACCESS_MASK DesiredAccess,
PLSA_HANDLE PolicyHandle)
{
FIXME_(advapi)("(%p,%p,0x%08lx,%p):stub\n",
SystemName, ObjectAttributes,
DesiredAccess, PolicyHandle);
FIXME("(%p,%p,0x%08lx,%p):stub\n",
SystemName, ObjectAttributes, DesiredAccess, PolicyHandle);
return 0xc0000000; /* generic error */
}
......@@ -723,7 +722,7 @@ LsaOpenPolicy(PLSA_UNICODE_STRING SystemName,
BOOL WINAPI
NotifyBootConfigStatus( DWORD x1 )
{
FIXME_(advapi)("(0x%08lx):stub\n",x1);
FIXME("(0x%08lx):stub\n",x1);
return 1;
}
......@@ -736,7 +735,7 @@ NotifyBootConfigStatus( DWORD x1 )
BOOL WINAPI
RevertToSelf( void )
{
FIXME_(advapi)("(), stub\n");
FIXME("(), stub\n");
return TRUE;
}
......@@ -746,7 +745,7 @@ RevertToSelf( void )
BOOL WINAPI
ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
{
FIXME_(advapi)("(%08x), stub\n", ImpersonationLevel);
FIXME("(%08x), stub\n", ImpersonationLevel);
return TRUE;
}
......@@ -758,9 +757,9 @@ AccessCheck(PSECURITY_DESCRIPTOR pSecurityDescriptor, HANDLE ClientToken,
DWORD DesiredAccess, PGENERIC_MAPPING GenericMapping, PPRIVILEGE_SET PrivilegeSet,
LPDWORD PrivilegeSetLength, LPDWORD GrantedAccess, LPBOOL AccessStatus)
{
FIXME_(advapi)("(%p, %04x, %08lx, %p, %p, %p, %p, %p), stub\n",
pSecurityDescriptor, ClientToken, DesiredAccess, GenericMapping,
PrivilegeSet, PrivilegeSetLength, GrantedAccess, AccessStatus);
FIXME("(%p, %04x, %08lx, %p, %p, %p, %p, %p), stub\n",
pSecurityDescriptor, ClientToken, DesiredAccess, GenericMapping,
PrivilegeSet, PrivilegeSetLength, GrantedAccess, AccessStatus);
*AccessStatus = TRUE;
return TRUE;
}
......@@ -777,7 +776,7 @@ AccessCheck(PSECURITY_DESCRIPTOR pSecurityDescriptor, HANDLE ClientToken,
BOOL WINAPI SetThreadToken(PHANDLE thread, HANDLE token)
{
FIXME_(advapi)("(%p, %x): stub\n", thread, token);
FIXME("(%p, %x): stub\n", thread, token);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
......
dlls/avifil32/avifile.c
View file @ dd03cc19
......@@ -14,7 +14,7 @@
#include "debugstr.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(avifile)
DEFAULT_DEBUG_CHANNEL(avifile)
DECLARE_DEBUG_CHANNEL(msvideo)
DECLARE_DEBUG_CHANNEL(relay)
......@@ -104,7 +104,7 @@ typedef struct IAVIStreamImpl {
void WINAPI
AVIFileInit(void) {
FIXME_(avifile)("(),stub!\n");
FIXME("(),stub!\n");
}
typedef struct IAVIFileImpl {
......@@ -148,14 +148,14 @@ static ULONG WINAPI IAVIFile_fnRelease(IAVIFile* iface) {
}
static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile*iface,AVIFILEINFOW*afi,LONG size) {
FIXME_(avifile)("(%p)->Info(%p,%ld)\n",iface,afi,size);
FIXME("(%p)->Info(%p,%ld)\n",iface,afi,size);
/* FIXME: fill out struct? */
return E_FAIL;
}
static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile*iface,PAVISTREAM*avis,DWORD fccType,LONG lParam) {
FIXME_(avifile)("(%p)->GetStream(%p,0x%08lx,%ld)\n",iface,avis,fccType,lParam);
FIXME("(%p)->GetStream(%p,0x%08lx,%ld)\n",iface,avis,fccType,lParam);
/* FIXME: create interface etc. */
return E_FAIL;
}
......@@ -165,18 +165,18 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile*iface,PAVISTREAM*avis,AVI
char fcc[5];
IAVIStreamImpl *istream;
FIXME_(avifile)("(%p,%p,%p)\n",This,avis,asi);
FIXME("(%p,%p,%p)\n",This,avis,asi);
istream = (IAVIStreamImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IAVIStreamImpl));
istream->ref = 1;
ICOM_VTBL(istream) = &iavist;
fcc[4]='\0';
memcpy(fcc,(char*)&(asi->fccType),4);
FIXME_(avifile)("\tfccType '%s'\n",fcc);
FIXME("\tfccType '%s'\n",fcc);
memcpy(fcc,(char*)&(asi->fccHandler),4);
FIXME_(avifile)("\tfccHandler '%s'\n",fcc);
FIXME_(avifile)("\tdwFlags 0x%08lx\n",asi->dwFlags);
FIXME_(avifile)("\tdwCaps 0x%08lx\n",asi->dwCaps);
FIXME_(avifile)("\tname '%s'\n",debugstr_w(asi->szName));
FIXME("\tfccHandler '%s'\n",fcc);
FIXME("\tdwFlags 0x%08lx\n",asi->dwFlags);
FIXME("\tdwCaps 0x%08lx\n",asi->dwCaps);
FIXME("\tname '%s'\n",debugstr_w(asi->szName));
istream->curframe = 0;
*avis = (PAVISTREAM)istream;
......@@ -184,25 +184,25 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile*iface,PAVISTREAM*avis,AVI
}
static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG size) {
FIXME_(avifile)("(%p)->WriteData(0x%08lx,%p,%ld)\n",iface,ckid,lpData,size);
FIXME("(%p)->WriteData(0x%08lx,%p,%ld)\n",iface,ckid,lpData,size);
/* FIXME: write data to file */
return E_FAIL;
}
static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG *size) {
FIXME_(avifile)("(%p)->ReadData(0x%08lx,%p,%p)\n",iface,ckid,lpData,size);
FIXME("(%p)->ReadData(0x%08lx,%p,%p)\n",iface,ckid,lpData,size);
/* FIXME: read at most size bytes from file */
return E_FAIL;
}
static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile*iface) {
FIXME_(avifile)("(%p)->EndRecord()\n",iface);
FIXME("(%p)->EndRecord()\n",iface);
/* FIXME: end record? */
return E_FAIL;
}
static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam) {
FIXME_(avifile)("(%p)->DeleteStream(0x%08lx,%ld)\n",iface,fccType,lParam);
FIXME("(%p)->DeleteStream(0x%08lx,%ld)\n",iface,fccType,lParam);
/* FIXME: delete stream? */
return E_FAIL;
}
......@@ -219,7 +219,7 @@ HRESULT WINAPI AVIFileOpenA(
else
sprintf(buf,"<clsid-0x%04lx>",(DWORD)lpHandler);
FIXME_(avifile)("(%p,%s,0x%08lx,%s),stub!\n",ppfile,szFile,(DWORD)uMode,buf);
FIXME("(%p,%s,0x%08lx,%s),stub!\n",ppfile,szFile,(DWORD)uMode,buf);
iavi = (IAVIFileImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IAVIFileImpl));
iavi->ref = 1;
ICOM_VTBL(iavi) = &iavift;
......@@ -262,22 +262,22 @@ static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) {
}
static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2) {
FIXME_(avifile)("(%p)->Create(0x%08lx,0x%08lx)\n",iface,lParam1,lParam2);
FIXME("(%p)->Create(0x%08lx,0x%08lx)\n",iface,lParam1,lParam2);
return E_FAIL;
}
static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size) {
FIXME_(avifile)("(%p)->Info(%p,%ld)\n",iface,psi,size);
FIXME("(%p)->Info(%p,%ld)\n",iface,psi,size);
return E_FAIL;
}
static LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags) {
FIXME_(avifile)("(%p)->FindSample(%ld,0x%08lx)\n",iface,pos,flags);
FIXME("(%p)->FindSample(%ld,0x%08lx)\n",iface,pos,flags);
return E_FAIL;
}
static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize) {
FIXME_(avifile)("(%p)->ReadFormat(%ld,%p,%p)\n",iface,pos,format,formatsize);
FIXME("(%p)->ReadFormat(%ld,%p,%p)\n",iface,pos,format,formatsize);
return E_FAIL;
}
......@@ -287,7 +287,7 @@ static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID f
static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize) {
IAVIStreamImpl *as = (IAVIStreamImpl*)iface;
FIXME_(avifile)("(%p)->SetFormat(%ld,%p,%ld)\n",iface,pos,format,formatsize);
FIXME("(%p)->SetFormat(%ld,%p,%ld)\n",iface,pos,format,formatsize);
if (as->lpInputFormat) HeapFree(GetProcessHeap(),0,as->lpInputFormat);
as->inputformatsize = formatsize;
as->lpInputFormat = HeapAlloc(GetProcessHeap(),0,formatsize);
......@@ -319,7 +319,7 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID fo
}
static HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread) {
FIXME_(avifile)("(%p)->Read(%ld,%ld,%p,%ld,%p,%p)\n",iface,start,samples,buffer,buffersize,bytesread,samplesread);
FIXME("(%p)->Read(%ld,%ld,%p,%ld,%p,%p)\n",iface,start,samples,buffer,buffersize,bytesread,samplesread);
return E_FAIL;
}
......@@ -327,7 +327,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG sample
IAVIStreamImpl *as = (IAVIStreamImpl*)iface;
DWORD ckid,xflags;
FIXME_(avifile)("(%p)->Write(%ld,%ld,%p,%ld,0x%08lx,%p,%p)\n",iface,start,samples,buffer,buffersize,flags,sampwritten,byteswritten);
FIXME("(%p)->Write(%ld,%ld,%p,%ld,0x%08lx,%p,%p)\n",iface,start,samples,buffer,buffersize,flags,sampwritten,byteswritten);
ICCompress(
as->hic,flags,
......@@ -353,21 +353,21 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG sample
}
static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples) {
FIXME_(avifile)("(%p)->Delete(%ld,%ld)\n",iface,start,samples);
FIXME("(%p)->Delete(%ld,%ld)\n",iface,start,samples);
return E_FAIL;
}
static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread) {
FIXME_(avifile)("(%p)->ReadData(0x%08lx,%p,%p)\n",iface,fcc,lp,lpread);
FIXME("(%p)->ReadData(0x%08lx,%p,%p)\n",iface,fcc,lp,lpread);
return E_FAIL;
}
static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size) {
FIXME_(avifile)("(%p)->WriteData(0x%08lx,%p,%ld)\n",iface,fcc,lp,size);
FIXME("(%p)->WriteData(0x%08lx,%p,%ld)\n",iface,fcc,lp,size);
return E_FAIL;
}
static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen) {
FIXME_(avifile)("(%p)->SetInfo(%p,%ld)\n",iface,info,infolen);
FIXME("(%p)->SetInfo(%p,%ld)\n",iface,info,infolen);
return E_FAIL;
}
......@@ -426,13 +426,13 @@ HRESULT WINAPI AVIFileInfoW(PAVIFILE iface,LPAVIFILEINFOW afi,LONG size) {
HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *aco,CLSID *pclsidHandler) {
char fcc[5];
IAVIStreamImpl *as;
FIXME_(avifile)("(%p,%p,%p,%p)\n",ppsCompressed,ppsSource,aco,pclsidHandler);
FIXME("(%p,%p,%p,%p)\n",ppsCompressed,ppsSource,aco,pclsidHandler);
fcc[4]='\0';
memcpy(fcc,&(aco->fccType),4);
FIXME_(avifile)("\tfccType: '%s'\n",fcc);
FIXME("\tfccType: '%s'\n",fcc);
memcpy(fcc,&(aco->fccHandler),4);
FIXME_(avifile)("\tfccHandler: '%s'\n",fcc);
FIXME_(avifile)("\tdwFlags: 0x%08lx\n",aco->dwFlags);
FIXME("\tfccHandler: '%s'\n",fcc);
FIXME("\tdwFlags: 0x%08lx\n",aco->dwFlags);
/* we just create a duplicate for now */
IAVIStream_AddRef(ppsSource);
......@@ -447,7 +447,7 @@ HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,PAVISTREAM ppsS
return AVIERR_UNSUPPORTED;
ICGetInfo(as->hic,&(as->icinfo),sizeof(ICINFO));
FIXME_(avifile)("Opened compressor: '%s' '%s'\n",debugstr_w(as->icinfo.szName),debugstr_w(as->icinfo.szDescription));
FIXME("Opened compressor: '%s' '%s'\n",debugstr_w(as->icinfo.szName),debugstr_w(as->icinfo.szDescription));
as->iscompressing = TRUE;
memcpy(&(as->aco),aco,sizeof(*aco));
if (as->icinfo.dwFlags & VIDCF_COMPRESSFRAMES) {
......@@ -530,5 +530,5 @@ ULONG WINAPI AVIFileRelease(PAVIFILE iface) {
}
void WINAPI AVIFileExit(void) {
FIXME_(avifile)("(), stub.\n");
FIXME("(), stub.\n");
}
dlls/comctl32/comctl32undoc.c
View file @ dd03cc19
......@@ -2221,7 +2221,7 @@ INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
BOOL WINAPI comctl32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
FIXME_(commctrl)("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
return TRUE;
}
......@@ -2235,7 +2235,7 @@ BOOL WINAPI comctl32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
BOOL WINAPI comctl32_411( HWND hw, DWORD b, DWORD c) {
FIXME_(commctrl)("(%x, %lx, %lx): stub!\n", hw, b, c);
FIXME("(%x, %lx, %lx): stub!\n", hw, b, c);
return TRUE;
}
......@@ -2249,7 +2249,7 @@ BOOL WINAPI comctl32_411( HWND hw, DWORD b, DWORD c) {
BOOL WINAPI comctl32_412( HWND hwnd, DWORD b, DWORD c)
{
FIXME_(commctrl)("(%x, %lx, %lx): stub!\n", hwnd, b, c);
FIXME("(%x, %lx, %lx): stub!\n", hwnd, b, c);
if (IsWindow (hwnd) == FALSE)
return FALSE;
......@@ -2270,7 +2270,7 @@ BOOL WINAPI comctl32_412( HWND hwnd, DWORD b, DWORD c)
BOOL WINAPI comctl32_413( HWND hw, DWORD b, DWORD c, DWORD d) {
FIXME_(commctrl)("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
return TRUE;
}
......@@ -2284,7 +2284,7 @@ BOOL WINAPI comctl32_413( HWND hw, DWORD b, DWORD c, DWORD d) {
BOOL WINAPI InitMUILanguage( LANGID uiLang) {
FIXME_(commctrl)("(%04x): stub!\n", uiLang);
FIXME("(%04x): stub!\n", uiLang);
return TRUE;
}
......
dlls/comctl32/flatsb.c
View file @ dd03cc19
......@@ -20,7 +20,7 @@
#include "flatsb.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(commctrl)
DEFAULT_DEBUG_CHANNEL(commctrl)
#define FlatSB_GetInfoPtr(hwnd) ((FLATSB_INFO*)GetWindowLongA (hwnd, 0))
......@@ -29,42 +29,42 @@ DECLARE_DEBUG_CHANNEL(commctrl)
BOOL WINAPI
FlatSB_EnableScrollBar(HWND hwnd, INT dummy, UINT dummy2)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
BOOL WINAPI
FlatSB_ShowScrollBar(HWND hwnd, INT code, BOOL flag)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
BOOL WINAPI
FlatSB_GetScrollRange(HWND hwnd, INT code, LPINT min, LPINT max)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
BOOL WINAPI
FlatSB_GetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
INT WINAPI
FlatSB_GetScrollPos(HWND hwnd, INT code)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
BOOL WINAPI
FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
......@@ -72,41 +72,41 @@ FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
INT WINAPI
FlatSB_SetScrollPos(HWND hwnd, INT code, INT pos, BOOL fRedraw)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
INT WINAPI
FlatSB_SetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info, BOOL fRedraw)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
INT WINAPI
FlatSB_SetScrollRange(HWND hwnd, INT code, INT min, INT max, BOOL fRedraw)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
BOOL WINAPI
FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
BOOL WINAPI InitializeFlatSB(HWND hwnd)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
HRESULT WINAPI UninitializeFlatSB(HWND hwnd)
{
FIXME_(commctrl)("stub\n");
FIXME("stub\n");
return 0;
}
......@@ -142,8 +142,8 @@ FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if (uMsg >= WM_USER)
ERR_(commctrl)("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
ERR("unknown msg %04x wp=%08x lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
}
return 0;
......
dlls/ole32/storage.c
View file @ dd03cc19
......@@ -23,7 +23,7 @@
#include "ldt.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(ole)
DEFAULT_DEBUG_CHANNEL(ole)
DECLARE_DEBUG_CHANNEL(relay)
struct storage_header {
......@@ -89,12 +89,12 @@ static BOOL
STORAGE_get_big_block(HFILE hf,int n,BYTE *block) {
assert(n>=-1);
if (-1==_llseek(hf,(n+1)*BIGSIZE,SEEK_SET)) {
WARN_(ole)(" seek failed (%ld)\n",GetLastError());
WARN(" seek failed (%ld)\n",GetLastError());
return FALSE;
}
assert((n+1)*BIGSIZE==_llseek(hf,0,SEEK_CUR));
if (BIGSIZE!=_lread(hf,block,BIGSIZE)) {
WARN_(ole)("(block size %d): read didn't read (%ld)\n",n,GetLastError());
WARN("(block size %d): read didn't read (%ld)\n",n,GetLastError());
assert(0);
return FALSE;
}
......@@ -108,12 +108,12 @@ static BOOL
STORAGE_put_big_block(HFILE hf,int n,BYTE *block) {
assert(n>=-1);
if (-1==_llseek(hf,(n+1)*BIGSIZE,SEEK_SET)) {
WARN_(ole)(" seek failed (%ld)\n",GetLastError());
WARN(" seek failed (%ld)\n",GetLastError());
return FALSE;
}
assert((n+1)*BIGSIZE==_llseek(hf,0,SEEK_CUR));
if (BIGSIZE!=_lwrite(hf,block,BIGSIZE)) {
WARN_(ole)(" write failed (%ld)\n",GetLastError());
WARN(" write failed (%ld)\n",GetLastError());
return FALSE;
}
return TRUE;
......@@ -793,7 +793,7 @@ HRESULT WINAPI IStream16_fnRead(
int cc;
if (!STORAGE_get_small_block(This->hf,blocknr,block)) {
WARN_(ole)("small block read failed!!!\n");
WARN("small block read failed!!!\n");
return E_FAIL;
}
cc = cb;
......@@ -813,7 +813,7 @@ HRESULT WINAPI IStream16_fnRead(
int cc;
if (!STORAGE_get_big_block(This->hf,blocknr,block)) {
WARN_(ole)("big block read failed!!!\n");
WARN("big block read failed!!!\n");
return E_FAIL;
}
cc = cb;
......@@ -1267,7 +1267,7 @@ HRESULT WINAPI IStorage16_fnStat(
LPSTORAGE16 iface,STATSTG16 *pstatstg, DWORD grfStatFlag
) {
ICOM_THIS(IStorage16Impl,iface);
TRACE_(ole)("(%p)->(%p,0x%08lx)\n",
TRACE("(%p)->(%p,0x%08lx)\n",
This,pstatstg,grfStatFlag
);
pstatstg->pwcsName=(LPOLESTR16)SEGPTR_GET(SEGPTR_STRDUP_WtoA(This->stde.pps_rawname));
......@@ -1291,7 +1291,7 @@ HRESULT WINAPI IStorage16_fnCommit(
LPSTORAGE16 iface,DWORD commitflags
) {
ICOM_THIS(IStorage16Impl,iface);
FIXME_(ole)("(%p)->(0x%08lx),STUB!\n",
FIXME("(%p)->(0x%08lx),STUB!\n",
This,commitflags
);
return S_OK;
......@@ -1308,7 +1308,7 @@ HRESULT WINAPI IStorage16_fnCopyTo(LPSTORAGE16 iface,DWORD ciidExclude,const IID
WINE_StringFromCLSID(rgiidExclude,xguid);
else
strcpy(xguid,"<no guid>");
FIXME_(ole)("IStorage16(%p)->(0x%08lx,%s,%p,%p),stub!\n",
FIXME("IStorage16(%p)->(0x%08lx,%s,%p,%p),stub!\n",
This,ciidExclude,xguid,SNB16Exclude,pstgDest
);
return S_OK;
......@@ -1330,11 +1330,11 @@ HRESULT WINAPI IStorage16_fnCreateStorage(
READ_HEADER;
TRACE_(ole)("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n",
TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n",
This,pwcsName,grfMode,dwStgFormat,reserved2,ppstg
);
if (grfMode & STGM_TRANSACTED)
FIXME_(ole)("We do not support transacted Compound Storage. Using direct mode.\n");
FIXME("We do not support transacted Compound Storage. Using direct mode.\n");
_create_istorage16(ppstg);
lpstg = (IStorage16Impl*)PTR_SEG_TO_LIN(*ppstg);
lpstg->hf = This->hf;
......@@ -1347,7 +1347,7 @@ HRESULT WINAPI IStorage16_fnCreateStorage(
stde.pps_dir = ppsent;
x = This->ppsent;
} else {
FIXME_(ole)(" use prev chain too ?\n");
FIXME(" use prev chain too ?\n");
x=stde.pps_dir;
if (1!=STORAGE_get_pps_entry(lpstg->hf,x,&stde))
return E_FAIL;
......@@ -1386,11 +1386,11 @@ HRESULT WINAPI IStorage16_fnCreateStream(
int ppsent,x;
struct storage_pps_entry stde;
TRACE_(ole)("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n",
TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n",
This,pwcsName,grfMode,reserved1,reserved2,ppstm
);
if (grfMode & STGM_TRANSACTED)
FIXME_(ole)("We do not support transacted Compound Storage. Using direct mode.\n");
FIXME("We do not support transacted Compound Storage. Using direct mode.\n");
_create_istream16(ppstm);
lpstr = (IStream16Impl*)PTR_SEG_TO_LIN(*ppstm);
DuplicateHandle( GetCurrentProcess(), This->hf, GetCurrentProcess(),
......@@ -1443,7 +1443,7 @@ HRESULT WINAPI IStorage16_fnOpenStorage(
This,pwcsName,pstgPrio,grfMode,snbExclude,reserved,ppstg
);
if (grfMode & STGM_TRANSACTED)
FIXME_(ole)("We do not support transacted Compound Storage. Using direct mode.\n");
FIXME("We do not support transacted Compound Storage. Using direct mode.\n");
_create_istorage16(ppstg);
lpstg = (IStream16Impl*)PTR_SEG_TO_LIN(*ppstg);
DuplicateHandle( GetCurrentProcess(), This->hf, GetCurrentProcess(),
......@@ -1478,7 +1478,7 @@ HRESULT WINAPI IStorage16_fnOpenStream(
This,pwcsName,reserved1,grfMode,reserved2,ppstm
);
if (grfMode & STGM_TRANSACTED)
FIXME_(ole)("We do not support transacted Compound Storage. Using direct mode.\n");
FIXME("We do not support transacted Compound Storage. Using direct mode.\n");
_create_istream16(ppstm);
lpstr = (IStream16Impl*)PTR_SEG_TO_LIN(*ppstm);
DuplicateHandle( GetCurrentProcess(), This->hf, GetCurrentProcess(),
......@@ -1580,13 +1580,13 @@ HRESULT WINAPI StgCreateDocFile16(
IStorage16Impl* lpstg;
struct storage_pps_entry stde;
TRACE_(ole)("(%s,0x%08lx,0x%08lx,%p)\n",
TRACE("(%s,0x%08lx,0x%08lx,%p)\n",
pwcsName,grfMode,reserved,ppstgOpen
);
_create_istorage16(ppstgOpen);
hf = CreateFileA(pwcsName,GENERIC_READ|GENERIC_WRITE,0,NULL,CREATE_NEW,0,0);
if (hf==INVALID_HANDLE_VALUE) {
WARN_(ole)("couldn't open file for storage:%ld\n",GetLastError());
WARN("couldn't open file for storage:%ld\n",GetLastError());
return E_FAIL;
}
lpstg = (IStorage16Impl*)PTR_SEG_TO_LIN(*ppstgOpen);
......@@ -1622,31 +1622,31 @@ HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) {
OFSTRUCT ofs;
BYTE magic[24];
TRACE_(ole)("(\'%s\')\n",fn);
TRACE("(\'%s\')\n",fn);
hf = OpenFile(fn,&ofs,OF_SHARE_DENY_NONE);
if (hf==HFILE_ERROR)
return STG_E_FILENOTFOUND;
if (24!=_lread(hf,magic,24)) {
WARN_(ole)(" too short\n");
WARN(" too short\n");
_lclose(hf);
return S_FALSE;
}
if (!memcmp(magic,STORAGE_magic,8)) {
WARN_(ole)(" -> YES\n");
WARN(" -> YES\n");
_lclose(hf);
return S_OK;
}
if (!memcmp(magic,STORAGE_notmagic,8)) {
WARN_(ole)(" -> NO\n");
WARN(" -> NO\n");
_lclose(hf);
return S_FALSE;
}
if (!memcmp(magic,STORAGE_oldmagic,8)) {
WARN_(ole)(" -> old format\n");
WARN(" -> old format\n");
_lclose(hf);
return STG_E_OLDFORMAT;
}
WARN_(ole)(" -> Invalid header.\n");
WARN(" -> Invalid header.\n");
_lclose(hf);
return STG_E_INVALIDHEADER;
}
......@@ -1677,13 +1677,13 @@ HRESULT WINAPI StgOpenStorage16(
IStorage16Impl* lpstg;
struct storage_pps_entry stde;
TRACE_(ole)("(%s,%p,0x%08lx,%p,%ld,%p)\n",
pwcsName,pstgPriority,grfMode,snbExclude,reserved,ppstgOpen
TRACE("(%s,%p,0x%08lx,%p,%ld,%p)\n",
pwcsName,pstgPriority,grfMode,snbExclude,reserved,ppstgOpen
);
_create_istorage16(ppstgOpen);
hf = CreateFileA(pwcsName,GENERIC_READ,0,NULL,0,0,0);
if (hf==INVALID_HANDLE_VALUE) {
WARN_(ole)("Couldn't open file for storage\n");
WARN("Couldn't open file for storage\n");
return E_FAIL;
}
lpstg = (IStorage16Impl*)PTR_SEG_TO_LIN(*ppstgOpen);
......
dlls/shell32/shellole.c
View file @ dd03cc19
......@@ -170,7 +170,7 @@ DWORD WINAPI SHGetDesktopFolder(IShellFolder **psf)
{
HRESULT hres = S_OK;
LPCLASSFACTORY lpclf;
TRACE_(shell)("%p->(%p)\n",psf,*psf);
TRACE("%p->(%p)\n",psf,*psf);
*psf=NULL;
......@@ -191,7 +191,7 @@ DWORD WINAPI SHGetDesktopFolder(IShellFolder **psf)
*psf = pdesktopfolder;
}
TRACE_(shell)("-- %p->(%p)\n",psf, *psf);
TRACE("-- %p->(%p)\n",psf, *psf);
return hres;
}
......
files/directory.c
View file @ dd03cc19
......@@ -30,7 +30,7 @@
#include "options.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(dosfs)
DEFAULT_DEBUG_CHANNEL(dosfs)
DECLARE_DEBUG_CHANNEL(file)
static DOS_FULL_NAME DIR_Windows;
......@@ -125,14 +125,14 @@ int DIR_Init(void)
SetEnvironmentVariableA( "windir", DIR_Windows.short_name );
SetEnvironmentVariableA( "winsysdir", DIR_System.short_name );
TRACE_(dosfs)("WindowsDir = %s (%s)\n",
TRACE("WindowsDir = %s (%s)\n",
DIR_Windows.short_name, DIR_Windows.long_name );
TRACE_(dosfs)("SystemDir = %s (%s)\n",
TRACE("SystemDir = %s (%s)\n",
DIR_System.short_name, DIR_System.long_name );
TRACE_(dosfs)("TempDir = %s (%s)\n",
TRACE("TempDir = %s (%s)\n",
tmp_dir.short_name, tmp_dir.long_name );
TRACE_(dosfs)("Path = %s\n", path );
TRACE_(dosfs)("Cwd = %c:\\%s\n",
TRACE("Path = %s\n", path );
TRACE("Cwd = %c:\\%s\n",
'A' + drive, DRIVE_GetDosCwd( drive ) );
return 1;
......@@ -650,7 +650,7 @@ DWORD WINAPI SearchPathA( LPCSTR path, LPCSTR name, LPCSTR ext, DWORD buflen,
for (p = buffer; *p; p++) if (*p == '/') *p = '\\';
if (lastpart) *lastpart = strrchr( buffer, '\\' ) + 1;
}
TRACE_(dosfs)("Returning %d\n", strlen(res) + 3 );
TRACE("Returning %d\n", strlen(res) + 3 );
return strlen(res) + 3;
}
......
files/dos_fs.c
View file @ dd03cc19
......@@ -35,7 +35,7 @@
#include "options.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(dosfs)
DEFAULT_DEBUG_CHANNEL(dosfs)
DECLARE_DEBUG_CHANNEL(file)
/* Define the VFAT ioctl to get both short and long file names */
......@@ -528,13 +528,13 @@ BOOL DOSFS_FindUnixName( LPCSTR path, LPCSTR name, LPSTR long_buf,
while (len > 1 && name[len-1] == '.') len--;
if (long_len < len + 1) return FALSE;
TRACE_(dosfs)("%s,%s\n", path, name );
TRACE("%s,%s\n", path, name );
if (!DOSFS_ToDosFCBFormat( name, dos_name )) dos_name[0] = '\0';
if (!(dir = DOSFS_OpenDir( path )))
{
WARN_(dosfs)("(%s,%s): can't open dir: %s\n",
WARN("(%s,%s): can't open dir: %s\n",
path, name, strerror(errno) );
return FALSE;
}
......@@ -574,11 +574,11 @@ BOOL DOSFS_FindUnixName( LPCSTR path, LPCSTR name, LPSTR long_buf,
else
DOSFS_Hash( long_name, short_buf, FALSE, ignore_case );
}
TRACE_(dosfs)("(%s,%s) -> %s (%s)\n",
path, name, long_name, short_buf ? short_buf : "***");
TRACE("(%s,%s) -> %s (%s)\n",
path, name, long_name, short_buf ? short_buf : "***");
}
else
WARN_(dosfs)("'%s' not found in '%s'\n", name, path);
WARN("'%s' not found in '%s'\n", name, path);
DOSFS_CloseDir( dir );
return ret;
}
......@@ -666,7 +666,7 @@ HFILE DOSFS_OpenDevice( const char *name, DWORD access )
to_dup = GetStdHandle( STD_OUTPUT_HANDLE );
break;
default:
FIXME_(dosfs)("can't open CON read/write\n");
FIXME("can't open CON read/write\n");
return HFILE_ERROR;
break;
}
......@@ -688,7 +688,7 @@ HFILE DOSFS_OpenDevice( const char *name, DWORD access )
if(devname[0])
{
TRACE_(file)("DOSFS_OpenDevice %s is %s\n",
DOSFS_Devices[i].name,devname);
DOSFS_Devices[i].name,devname);
r = FILE_CreateFile( devname, access,
FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, 0, -1 );
......@@ -697,7 +697,7 @@ HFILE DOSFS_OpenDevice( const char *name, DWORD access )
}
}
FIXME_(dosfs)("device open %s not supported (yet)\n",DOSFS_Devices[i].name);
FIXME("device open %s not supported (yet)\n",DOSFS_Devices[i].name);
return HFILE_ERROR;
}
}
......@@ -757,8 +757,7 @@ BOOL DOSFS_GetFullName( LPCSTR name, BOOL check_last, DOS_FULL_NAME *full )
UINT flags;
char *p_l, *p_s, *root;
TRACE_(dosfs)("%s (last=%d)\n",
name, check_last );
TRACE("%s (last=%d)\n", name, check_last );
if ((full->drive = DOSFS_GetPathDrive( &name )) == -1) return FALSE;
flags = DRIVE_GetFlags( full->drive );
......@@ -870,8 +869,7 @@ BOOL DOSFS_GetFullName( LPCSTR name, BOOL check_last, DOS_FULL_NAME *full )
}
if (!full->long_name[0]) strcpy( full->long_name, "/" );
if (!full->short_name[2]) strcpy( full->short_name + 2, "\\" );
TRACE_(dosfs)("returning %s = %s\n",
full->long_name, full->short_name );
TRACE("returning %s = %s\n", full->long_name, full->short_name );
return TRUE;
}
......@@ -1070,7 +1068,7 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
char *endchar = buffer + sizeof(buffer) - 2;
*endchar = '\0';
TRACE_(dosfs)("converting '%s'\n", name );
TRACE("converting '%s'\n", name );
if (!name || ((drive = DOSFS_GetPathDrive( &name )) == -1) )
{ SetLastError( ERROR_INVALID_PARAMETER );
......@@ -1144,7 +1142,7 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
lstrcpynA( result, buffer, len );
}
TRACE_(dosfs)("returning '%s'\n", buffer );
TRACE("returning '%s'\n", buffer );
/* If the lpBuffer buffer is too small, the return value is the
size of the buffer, in characters, required to hold the path. */
......@@ -1278,7 +1276,7 @@ static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATAA *entry )
lstrcpynA( p, long_name, sizeof(buffer) - (int)(p - buffer) );
if (!FILE_Stat( buffer, &fileinfo ))
{
WARN_(dosfs)("can't stat %s\n", buffer);
WARN("can't stat %s\n", buffer);
continue;
}
if (fileinfo.dwFileAttributes & ~attr) continue;
......@@ -1300,9 +1298,9 @@ static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATAA *entry )
lstrcpynA( entry->cFileName, long_name, sizeof(entry->cFileName) );
if (!(flags & DRIVE_CASE_PRESERVING)) CharLowerA( entry->cFileName );
TRACE_(dosfs)("returning %s (%s) %02lx %ld\n",
entry->cFileName, entry->cAlternateFileName,
entry->dwFileAttributes, entry->nFileSizeLow );
TRACE("returning %s (%s) %02lx %ld\n",
entry->cFileName, entry->cAlternateFileName,
entry->dwFileAttributes, entry->nFileSizeLow );
return 1;
}
return 0; /* End of directory */
......@@ -1865,7 +1863,7 @@ DWORD WINAPI QueryDosDeviceA(LPCSTR devname,LPSTR target,DWORD bufsize)
LPSTR s;
char buffer[200];
TRACE_(dosfs)("(%s,...)\n",devname?devname:"<null>");
TRACE("(%s,...)\n", devname ? devname : "<null>");
if (!devname) {
/* return known MSDOS devices */
strcpy(buffer,"CON COM1 COM2 LPT1 NUL ");
......@@ -1941,7 +1939,7 @@ BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
* DefineDosDeviceA (KERNEL32.182)
*/
BOOL WINAPI DefineDosDeviceA(DWORD flags,LPCSTR devname,LPCSTR targetpath) {
FIXME_(dosfs)("(0x%08lx,%s,%s),stub!\n",flags,devname,targetpath);
FIXME("(0x%08lx,%s,%s),stub!\n",flags,devname,targetpath);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
files/drive.c
View file @ dd03cc19
......@@ -45,7 +45,7 @@
#include "task.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(dosfs)
DEFAULT_DEBUG_CHANNEL(dosfs)
DECLARE_DEBUG_CHANNEL(file)
typedef struct
......@@ -204,12 +204,13 @@ int DRIVE_Init(void)
DRIVE_CurDrive = i;
count++;
TRACE_(dosfs)("%s: path=%s type=%s label='%s' serial=%08lx flags=%08x dev=%x ino=%x\n",
name, path, DRIVE_Types[drive->type],
drive->label, drive->serial, drive->flags,
(int)drive->dev, (int)drive->ino );
TRACE("%s: path=%s type=%s label='%s' serial=%08lx "
"flags=%08x dev=%x ino=%x\n",
name, path, DRIVE_Types[drive->type],
drive->label, drive->serial, drive->flags,
(int)drive->dev, (int)drive->ino );
}
else WARN_(dosfs)("%s: not defined\n", name );
else WARN("%s: not defined\n", name );
}
if (!count)
......@@ -276,7 +277,7 @@ int DRIVE_SetCurrentDrive( int drive )
SetLastError( ERROR_INVALID_DRIVE );
return 0;
}
TRACE_(dosfs)("%c:\n", 'A' + drive );
TRACE("%c:\n", 'A' + drive );
DRIVE_CurDrive = drive;
if (pTask) pTask->curdrive = drive | 0x80;
return 1;
......@@ -336,9 +337,8 @@ int DRIVE_FindDriveRoot( const char **path )
*next = 0;
if (rootdrive != -1)
TRACE_(dosfs)("%s -> drive %c:, root='%s', name='%s'\n",
buffer, 'A' + rootdrive,
DOSDrives[rootdrive].root, *path );
TRACE("%s -> drive %c:, root='%s', name='%s'\n",
buffer, 'A' + rootdrive, DOSDrives[rootdrive].root, *path );
return rootdrive;
}
......@@ -459,7 +459,7 @@ int DRIVE_Chdir( int drive, const char *path )
strcpy( buffer, "A:" );
buffer[0] += drive;
TRACE_(dosfs)("(%c:,%s)\n", buffer[0], path );
TRACE("(%c:,%s)\n", buffer[0], path );
lstrcpynA( buffer + 2, path, sizeof(buffer) - 2 );
if (!DOSFS_GetFullName( buffer, TRUE, &full_name )) return 0;
......@@ -472,7 +472,7 @@ int DRIVE_Chdir( int drive, const char *path )
unix_cwd = full_name.long_name + strlen( DOSDrives[drive].root );
while (*unix_cwd == '/') unix_cwd++;
TRACE_(dosfs)("(%c:): unix_cwd=%s dos_cwd=%s\n",
TRACE("(%c:): unix_cwd=%s dos_cwd=%s\n",
'A' + drive, unix_cwd, full_name.short_name + 3 );
HeapFree( SystemHeap, 0, DOSDrives[drive].dos_cwd );
......@@ -545,10 +545,8 @@ int DRIVE_SetLogicalMapping ( int existing_drive, int new_drive )
if ( new->root )
{
TRACE_(dosfs)("Can\'t map drive %c to drive %c - "
"drive %c already exists\n",
'A' + existing_drive, 'A' + new_drive,
'A' + new_drive );
TRACE("Can\'t map drive %c to drive %c - drive %c already exists\n",
'A' + existing_drive, 'A' + new_drive, 'A' + new_drive );
/* it is already mapped there, so return success */
if (!strcmp(old->root,new->root))
return 1;
......@@ -565,8 +563,8 @@ int DRIVE_SetLogicalMapping ( int existing_drive, int new_drive )
new->dev = old->dev;
new->ino = old->ino;
TRACE_(dosfs)("Drive %c is now equal to drive %c\n",
'A' + new_drive, 'A' + existing_drive );
TRACE("Drive %c is now equal to drive %c\n",
'A' + new_drive, 'A' + existing_drive );
return 1;
}
......@@ -662,7 +660,7 @@ static int DRIVE_GetFreeSpace( int drive, PULARGE_INTEGER size,
#endif
{
FILE_SetDosError();
WARN_(dosfs)("cannot do statfs(%s)\n", DOSDrives[drive].root);
WARN("cannot do statfs(%s)\n", DOSDrives[drive].root);
return 0;
}
......@@ -855,10 +853,10 @@ BOOL WINAPI GetDiskFreeSpaceExA( LPCSTR root,
{
if ((root[1]) && ((root[1] != ':') || (root[2] != '\\')))
{
FIXME_(dosfs)("there are valid root names which are not supported yet\n");
FIXME("there are valid root names which are not supported yet\n");
/* ..like UNC names, for instance. */
WARN_(dosfs)("invalid root '%s'\n", root );
WARN("invalid root '%s'\n", root );
return FALSE;
}
drive = toupper(root[0]) - 'A';
......@@ -893,7 +891,7 @@ BOOL WINAPI GetDiskFreeSpaceExA( LPCSTR root,
if (GetVersionExA(&ovi))
{
if (ovi.dwPlatformId == VER_PLATFORM_WIN32_NT && ovi.dwMajorVersion > 4)
FIXME_(dosfs)("no per-user quota support yet\n");
FIXME("no per-user quota support yet\n");
}
}
......@@ -936,7 +934,7 @@ BOOL WINAPI GetDiskFreeSpaceExW( LPCWSTR root, PULARGE_INTEGER avail,
UINT16 WINAPI GetDriveType16(
UINT16 drive /* [in] number (NOT letter) of drive */
) {
TRACE_(dosfs)("(%c:)\n", 'A' + drive );
TRACE("(%c:)\n", 'A' + drive );
switch(DRIVE_GetType(drive))
{
case TYPE_FLOPPY: return DRIVE_REMOVABLE;
......@@ -981,14 +979,14 @@ UINT16 WINAPI GetDriveType16(
UINT WINAPI GetDriveTypeA(LPCSTR root /* String describing drive */)
{
int drive;
TRACE_(dosfs)("(%s)\n", debugstr_a(root));
TRACE("(%s)\n", debugstr_a(root));
if (NULL == root) drive = DRIVE_GetCurrentDrive();
else
{
if ((root[1]) && (root[1] != ':'))
{
WARN_(dosfs)("invalid root '%s'\n", debugstr_a(root));
WARN("invalid root '%s'\n", debugstr_a(root));
return DRIVE_DOESNOTEXIST;
}
drive = toupper(root[0]) - 'A';
......@@ -1198,7 +1196,7 @@ BOOL WINAPI GetVolumeInformationA( LPCSTR root, LPSTR label,
{
if ((root[1]) && (root[1] != ':'))
{
WARN_(dosfs)("invalid root '%s'\n",root);
WARN("invalid root '%s'\n",root);
return FALSE;
}
drive = toupper(root[0]) - 'A';
......@@ -1271,7 +1269,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label,
*/
BOOL WINAPI SetVolumeLabelA(LPCSTR rootpath,LPCSTR volname)
{
FIXME_(dosfs)("(%s,%s),stub!\n",rootpath,volname);
FIXME("(%s,%s),stub!\n",rootpath,volname);
return TRUE;
}
......
graphics/bitblt.c
View file @ dd03cc19
......@@ -7,7 +7,7 @@
#include "dc.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(bitblt)
DEFAULT_DEBUG_CHANNEL(bitblt)
DECLARE_DEBUG_CHANNEL(bitmap)
DECLARE_DEBUG_CHANNEL(gdi)
......@@ -21,8 +21,7 @@ BOOL16 WINAPI PatBlt16( HDC16 hdc, INT16 left, INT16 top,
DC * dc = DC_GetDCPtr( hdc );
if (!dc || !dc->funcs->pPatBlt) return FALSE;
TRACE_(bitblt)("%04x %d,%d %dx%d %06lx\n",
hdc, left, top, width, height, rop );
TRACE("%04x %d,%d %dx%d %06lx\n", hdc, left, top, width, height, rop );
return dc->funcs->pPatBlt( dc, left, top, width, height, rop );
}
......@@ -36,8 +35,7 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top,
DC * dc = DC_GetDCPtr( hdc );
if (!dc || !dc->funcs->pPatBlt) return FALSE;
TRACE_(bitblt)("%04x %d,%d %dx%d %06lx\n",
hdc, left, top, width, height, rop );
TRACE("%04x %d,%d %dx%d %06lx\n", hdc, left, top, width, height, rop );
return dc->funcs->pPatBlt( dc, left, top, width, height, rop );
}
......@@ -55,9 +53,9 @@ BOOL16 WINAPI BitBlt16( HDC16 hdcDst, INT16 xDst, INT16 yDst, INT16 width,
if (!dcDst->funcs->pBitBlt) return FALSE;
dcSrc = DC_GetDCPtr( hdcSrc );
TRACE_(bitblt)("hdcSrc=%04x %d,%d %d bpp -> hdcDest=%04x %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, dcSrc ? dcSrc->w.bitsPerPixel : 0,
hdcDst, xDst, yDst, width, height, dcDst->w.bitsPerPixel, rop);
TRACE("hdcSrc=%04x %d,%d %d bpp->hdcDest=%04x %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, dcSrc ? dcSrc->w.bitsPerPixel : 0,
hdcDst, xDst, yDst, width, height, dcDst->w.bitsPerPixel, rop);
return dcDst->funcs->pBitBlt( dcDst, xDst, yDst, width, height,
dcSrc, xSrc, ySrc, rop );
}
......@@ -76,9 +74,9 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width,
if (!dcDst->funcs->pBitBlt) return FALSE;
dcSrc = DC_GetDCPtr( hdcSrc );
TRACE_(bitblt)("hdcSrc=%04x %d,%d %d bpp -> hdcDest=%04x %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, dcSrc ? dcSrc->w.bitsPerPixel : 0,
hdcDst, xDst, yDst, width, height, dcDst->w.bitsPerPixel, rop);
TRACE("hdcSrc=%04x %d,%d %d bpp->hdcDest=%04x %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, dcSrc ? dcSrc->w.bitsPerPixel : 0,
hdcDst, xDst, yDst, width, height, dcDst->w.bitsPerPixel, rop);
return dcDst->funcs->pBitBlt( dcDst, xDst, yDst, width, height,
dcSrc, xSrc, ySrc, rop );
}
......@@ -98,10 +96,10 @@ BOOL16 WINAPI StretchBlt16( HDC16 hdcDst, INT16 xDst, INT16 yDst,
if (!dcDst->funcs->pStretchBlt) return FALSE;
dcSrc = DC_GetDCPtr( hdcSrc );
TRACE_(bitblt)("%04x %d,%d %dx%dx%d -> %04x %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, widthSrc, heightSrc,
dcSrc ? dcSrc->w.bitsPerPixel : 0, hdcDst, xDst, yDst,
widthDst, heightDst, dcDst->w.bitsPerPixel, rop );
TRACE("%04x %d,%d %dx%dx%d -> %04x %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, widthSrc, heightSrc,
dcSrc ? dcSrc->w.bitsPerPixel : 0, hdcDst, xDst, yDst,
widthDst, heightDst, dcDst->w.bitsPerPixel, rop );
return dcDst->funcs->pStretchBlt( dcDst, xDst, yDst, widthDst, heightDst,
dcSrc, xSrc, ySrc, widthSrc, heightSrc,
rop );
......@@ -122,10 +120,10 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst,
if (!dcDst->funcs->pStretchBlt) return FALSE;
dcSrc = DC_GetDCPtr( hdcSrc );
TRACE_(bitblt)("%04x %d,%d %dx%dx%d -> %04x %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, widthSrc, heightSrc,
dcSrc ? dcSrc->w.bitsPerPixel : 0, hdcDst, xDst, yDst,
widthDst, heightDst, dcDst->w.bitsPerPixel, rop );
TRACE("%04x %d,%d %dx%dx%d -> %04x %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, widthSrc, heightSrc,
dcSrc ? dcSrc->w.bitsPerPixel : 0, hdcDst, xDst, yDst,
widthDst, heightDst, dcDst->w.bitsPerPixel, rop );
return dcDst->funcs->pStretchBlt( dcDst, xDst, yDst, widthDst, heightDst,
dcSrc, xSrc, ySrc, widthSrc, heightSrc,
rop );
......
graphics/metafiledrv/objects.c
View file @ dd03cc19
......@@ -16,8 +16,8 @@
#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(metafile)
DECLARE_DEBUG_CHANNEL(gdi)
DECLARE_DEBUG_CHANNEL(metafile)
/***********************************************************************
* MFDRV_BITMAP_SelectObject
......@@ -67,7 +67,7 @@ INT16 MFDRV_CreateBrushIndirect(DC *dc, HBRUSH hBrush )
GetObjectA(brushObj->logbrush.lbHatch, sizeof(bm), &bm);
if(bm.bmBitsPixel != 1 || bm.bmPlanes != 1) {
FIXME_(metafile)("Trying to store a colour pattern brush\n");
FIXME("Trying to store a colour pattern brush\n");
return FALSE;
}
......@@ -123,8 +123,7 @@ INT16 MFDRV_CreateBrushIndirect(DC *dc, HBRUSH hBrush )
break;
}
default:
FIXME_(metafile)("Unkonwn brush style %x\n",
brushObj->logbrush.lbStyle);
FIXME("Unkonwn brush style %x\n", brushObj->logbrush.lbStyle);
return -1;
}
index = MFDRV_AddHandleDC( dc );
......
if1632/thunk.c
View file @ dd03cc19
......@@ -22,7 +22,7 @@
#include "keyboard.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(thunk)
DEFAULT_DEBUG_CHANNEL(thunk)
/* List of the 16-bit callback functions. This list is used */
......@@ -150,8 +150,8 @@ FARPROC THUNK_Alloc( FARPROC16 func, RELAY relay )
{
FARPROC proc = (FARPROC)((ENTRYPOINT16 *)PTR_SEG_TO_LIN( func ))->target;
TRACE_(thunk)( "(%04x:%04x, %p) -> built-in API %p\n",
SELECTOROF( func ), OFFSETOF( func ), relay, proc );
TRACE( "(%04x:%04x, %p) -> built-in API %p\n",
SELECTOROF( func ), OFFSETOF( func ), relay, proc );
return proc;
}
......@@ -170,8 +170,8 @@ FARPROC THUNK_Alloc( FARPROC16 func, RELAY relay )
firstThunk = thunk;
}
TRACE_(thunk)( "(%04x:%04x, %p) -> allocated thunk %p\n",
SELECTOROF( func ), OFFSETOF( func ), relay, thunk );
TRACE( "(%04x:%04x, %p) -> allocated thunk %p\n",
SELECTOROF( func ), OFFSETOF( func ), relay, thunk );
return (FARPROC)thunk;
}
......@@ -196,7 +196,7 @@ void THUNK_Free( FARPROC thunk )
return;
}
}
ERR_(thunk)("invalid thunk addr %p\n", thunk );
ERR("invalid thunk addr %p\n", thunk );
return;
}
......@@ -428,20 +428,20 @@ UINT WINAPI ThunkConnect16(
{
directionSL = TRUE;
TRACE_(thunk)("SL01 thunk %s (%lx) -> %s (%s), Reason: %ld\n",
module16, (DWORD)TD, module32, thunkfun32, dwReason);
TRACE("SL01 thunk %s (%lx) -> %s (%s), Reason: %ld\n",
module16, (DWORD)TD, module32, thunkfun32, dwReason);
}
else if (!strncmp(TD->magic, "LS01", 4))
{
directionSL = FALSE;
TRACE_(thunk)("LS01 thunk %s (%lx) <- %s (%s), Reason: %ld\n",
module16, (DWORD)TD, module32, thunkfun32, dwReason);
TRACE("LS01 thunk %s (%lx) <- %s (%s), Reason: %ld\n",
module16, (DWORD)TD, module32, thunkfun32, dwReason);
}
else
{
ERR_(thunk)("Invalid magic %c%c%c%c\n",
TD->magic[0], TD->magic[1], TD->magic[2], TD->magic[3]);
ERR("Invalid magic %c%c%c%c\n",
TD->magic[0], TD->magic[1], TD->magic[2], TD->magic[3]);
return 0;
}
......@@ -477,7 +477,7 @@ UINT WINAPI ThunkConnect16(
if (SL->flags2 & 0x80000000)
{
TRACE_(thunk)("Preloading 32-bit library\n");
TRACE("Preloading 32-bit library\n");
LoadLibraryA(module32);
}
}
......@@ -561,11 +561,11 @@ void WINAPI C16ThkSL01(CONTEXT86 *context)
if (!td)
{
ERR_(thunk)("ThunkConnect16 was not called!\n");
ERR("ThunkConnect16 was not called!\n");
return;
}
TRACE_(thunk)("Creating stub for ThunkDataSL %08lx\n", (DWORD)td);
TRACE("Creating stub for ThunkDataSL %08lx\n", (DWORD)td);
/* We produce the following code:
......@@ -605,8 +605,8 @@ void WINAPI C16ThkSL01(CONTEXT86 *context)
DWORD targetNr = CX_reg(context) / 4;
struct SLTargetDB *tdb;
TRACE_(thunk)("Process %08lx calling target %ld of ThunkDataSL %08lx\n",
(DWORD)PROCESS_Current(), targetNr, (DWORD)td);
TRACE("Process %08lx calling target %ld of ThunkDataSL %08lx\n",
(DWORD)PROCESS_Current(), targetNr, (DWORD)td);
for (tdb = td->targetDB; tdb; tdb = tdb->next)
if (tdb->process == PROCESS_Current())
......@@ -614,7 +614,7 @@ void WINAPI C16ThkSL01(CONTEXT86 *context)
if (!tdb)
{
TRACE_(thunk)("Loading 32-bit library %s\n", td->pszDll32);
TRACE("Loading 32-bit library %s\n", td->pszDll32);
LoadLibraryA(td->pszDll32);
for (tdb = td->targetDB; tdb; tdb = tdb->next)
......@@ -626,7 +626,7 @@ void WINAPI C16ThkSL01(CONTEXT86 *context)
{
EDX_reg(context) = tdb->targetTable[targetNr];
TRACE_(thunk)("Call target is %08lx\n", EDX_reg(context));
TRACE("Call target is %08lx\n", EDX_reg(context));
}
else
{
......@@ -637,8 +637,8 @@ void WINAPI C16ThkSL01(CONTEXT86 *context)
CS_reg(context) = stack[3];
ESP_reg(context) += td->apiDB[targetNr].nrArgBytes + 4;
ERR_(thunk)("Process %08lx did not ThunkConnect32 %s to %s\n",
(DWORD)PROCESS_Current(), td->pszDll32, td->pszDll16);
ERR("Process %08lx did not ThunkConnect32 %s to %s\n",
(DWORD)PROCESS_Current(), td->pszDll32, td->pszDll16);
}
}
}
......
loader/elfdll.c
View file @ dd03cc19
......@@ -20,7 +20,7 @@
#include "debugtools.h"
#include "winerror.h"
DECLARE_DEBUG_CHANNEL(elfdll)
DEFAULT_DEBUG_CHANNEL(elfdll)
#if defined(HAVE_DL_API)
#include <dlfcn.h>
......@@ -84,7 +84,7 @@ void *ELFDLL_dlopen(const char *libname, int flags)
if(len + namelen + 1 >= sizeof(buffer))
{
ERR_(elfdll)("Buffer overflow! Check EXTRA_LD_LIBRARY_PATH or increase buffer size.\n");
ERR("Buffer overflow! Check EXTRA_LD_LIBRARY_PATH or increase buffer size.\n");
return NULL;
}
......@@ -97,7 +97,7 @@ void *ELFDLL_dlopen(const char *libname, int flags)
else
strcpy(buffer + len, libname);
TRACE_(elfdll)("Trying dlopen('%s', %d)\n", buffer, flags);
TRACE("Trying dlopen('%s', %d)\n", buffer, flags);
handle = dlopen(buffer, flags);
if(handle)
......@@ -216,7 +216,7 @@ static WINE_MODREF *ELFDLL_CreateModref(HMODULE hModule, LPCSTR path)
{
if ( PROCESS_Current()->exe_modref )
FIXME_(elfdll)( "Trying to load second .EXE file: %s\n", path );
FIXME( "Trying to load second .EXE file: %s\n", path );
else
PROCESS_Current()->exe_modref = wm;
}
......@@ -301,7 +301,7 @@ WINE_MODREF *ELFDLL_LoadLibraryExA(LPCSTR path, DWORD flags, DWORD *err)
dlhandle = ELFDLL_dlopen(soname, RTLD_LAZY);
if(!dlhandle)
{
WARN_(elfdll)("Could not load %s (%s)\n", soname, dlerror());
WARN("Could not load %s (%s)\n", soname, dlerror());
*err = ERROR_FILE_NOT_FOUND;
return NULL;
}
......@@ -312,7 +312,7 @@ WINE_MODREF *ELFDLL_LoadLibraryExA(LPCSTR path, DWORD flags, DWORD *err)
image = (struct elfdll_image *)dlsym(dlhandle, soname);
if(!image)
{
ERR_(elfdll)("Could not get elfdll image descriptor %s (%s)\n", soname, dlerror());
ERR("Could not get elfdll image descriptor %s (%s)\n", soname, dlerror());
dlclose(dlhandle);
*err = ERROR_BAD_FORMAT;
return NULL;
......@@ -322,7 +322,7 @@ WINE_MODREF *ELFDLL_LoadLibraryExA(LPCSTR path, DWORD flags, DWORD *err)
hmod16 = ELFDLL_CreateNEModule(image->ne_module_start, image->ne_module_size);
if(!hmod16)
{
ERR_(elfdll)("Could not create win16 dummy module for %s\n", path);
ERR("Could not create win16 dummy module for %s\n", path);
dlclose(dlhandle);
*err = ERROR_OUTOFMEMORY;
return NULL;
......@@ -333,7 +333,7 @@ WINE_MODREF *ELFDLL_LoadLibraryExA(LPCSTR path, DWORD flags, DWORD *err)
wm = ELFDLL_CreateModref(image->pe_module_start, path);
if(!wm)
{
ERR_(elfdll)("Could not create WINE_MODREF for %s\n", path);
ERR("Could not create WINE_MODREF for %s\n", path);
GLOBAL_FreeBlock((HGLOBAL16)hmod16);
dlclose(dlhandle);
*err = ERROR_OUTOFMEMORY;
......
loader/resource.c
View file @ dd03cc19
......@@ -33,8 +33,8 @@
#include "debugstr.h"
#include "winnls.h"
DEFAULT_DEBUG_CHANNEL(resource)
DECLARE_DEBUG_CHANNEL(accel)
DECLARE_DEBUG_CHANNEL(resource)
extern WORD WINE_LanguageId;
......@@ -68,7 +68,7 @@ static HRSRC16 MapHRsrc32To16( NE_MODULE *pModule, HANDLE hRsrc32, WORD type )
if ( !(map = (HRSRC_MAP *)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(HRSRC_MAP) ) ) )
{
ERR_(resource)("Cannot allocate HRSRC map\n" );
ERR("Cannot allocate HRSRC map\n" );
return 0;
}
pModule->hRsrcMap = (LPVOID)map;
......@@ -87,7 +87,7 @@ static HRSRC16 MapHRsrc32To16( NE_MODULE *pModule, HANDLE hRsrc32, WORD type )
(map->nAlloc + HRSRC_MAP_BLOCKSIZE)
* sizeof(HRSRC_ELEM) ) ))
{
ERR_(resource)("Cannot grow HRSRC map\n" );
ERR("Cannot grow HRSRC map\n" );
return 0;
}
map->elem = newElem;
......@@ -139,13 +139,14 @@ static HRSRC RES_FindResource( HMODULE hModule, LPCSTR type,
WINE_MODREF *wm = pModule && pModule->module32?
MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
TRACE_(resource)("(%08x %s, %08x%s, %08x%s, %04x, %s, %s)\n",
hModule, pModule ? (char *)NE_MODULE_NAME(pModule) : "NULL dereference",
(UINT)type, HIWORD(type)? (bUnicode? debugstr_w((LPWSTR)type) : debugstr_a(type)) : "",
(UINT)name, HIWORD(name)? (bUnicode? debugstr_w((LPWSTR)name) : debugstr_a(name)) : "",
lang,
bUnicode? "W" : "A",
bRet16? "NE" : "PE" );
TRACE("(%08x %s, %08x%s, %08x%s, %04x, %s, %s)\n",
hModule,
pModule ? (char *)NE_MODULE_NAME(pModule) : "NULL dereference",
(UINT)type, HIWORD(type)? (bUnicode? debugstr_w((LPWSTR)type) : debugstr_a(type)) : "",
(UINT)name, HIWORD(name)? (bUnicode? debugstr_w((LPWSTR)name) : debugstr_a(name)) : "",
lang,
bUnicode? "W" : "A",
bRet16? "NE" : "PE" );
if ( !pModule ) return 0;
......@@ -174,7 +175,7 @@ static HRSRC RES_FindResource( HMODULE hModule, LPCSTR type,
break;
default:
ERR_(resource)("unknown module type %d\n", wm->type );
ERR("unknown module type %d\n", wm->type );
break;
}
......@@ -230,8 +231,8 @@ static DWORD RES_SizeofResource( HMODULE hModule, HRSRC hRsrc, BOOL bRet16 )
WINE_MODREF *wm = pModule && pModule->module32?
MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
TRACE_(resource)("(%08x %s, %08x, %s)\n",
hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
TRACE("(%08x %s, %08x, %s)\n",
hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
if ( !pModule || !hRsrc ) return 0;
......@@ -253,7 +254,7 @@ static DWORD RES_SizeofResource( HMODULE hModule, HRSRC hRsrc, BOOL bRet16 )
break;
default:
ERR_(resource)("unknown module type %d\n", wm->type );
ERR("unknown module type %d\n", wm->type );
break;
}
}
......@@ -281,8 +282,8 @@ static HFILE RES_AccessResource( HMODULE hModule, HRSRC hRsrc, BOOL bRet16 )
WINE_MODREF *wm = pModule && pModule->module32?
MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
TRACE_(resource)("(%08x %s, %08x, %s)\n",
hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
TRACE("(%08x %s, %08x, %s)\n",
hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
if ( !pModule || !hRsrc ) return HFILE_ERROR;
......@@ -294,7 +295,7 @@ static HFILE RES_AccessResource( HMODULE hModule, HRSRC hRsrc, BOOL bRet16 )
HRSRC hRsrc32 = HIWORD(hRsrc)? hRsrc : MapHRsrc16To32( pModule, hRsrc );
#endif
FIXME_(resource)("32-bit modules not yet supported.\n" );
FIXME("32-bit modules not yet supported.\n" );
hFile = HFILE_ERROR;
/* If we need to return a 16-bit file handle, convert it */
......@@ -329,8 +330,8 @@ static HGLOBAL RES_LoadResource( HMODULE hModule, HRSRC hRsrc, BOOL bRet16 )
WINE_MODREF *wm = pModule && pModule->module32?
MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
TRACE_(resource)("(%08x %s, %08x, %s)\n",
hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
TRACE("(%08x %s, %08x, %s)\n",
hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
if ( !pModule || !hRsrc ) return 0;
......@@ -352,7 +353,7 @@ static HGLOBAL RES_LoadResource( HMODULE hModule, HRSRC hRsrc, BOOL bRet16 )
break;
default:
ERR_(resource)("unknown module type %d\n", wm->type );
ERR("unknown module type %d\n", wm->type );
break;
}
......@@ -388,14 +389,14 @@ static LPVOID RES_LockResource( HGLOBAL handle, BOOL bRet16 )
{
LPVOID bits = NULL;
TRACE_(resource)("(%08x, %s)\n", handle, bRet16? "NE" : "PE" );
TRACE("(%08x, %s)\n", handle, bRet16? "NE" : "PE" );
if ( HIWORD( handle ) )
{
/* 32-bit memory handle */
if ( bRet16 )
FIXME_(resource)("can't return SEGPTR to 32-bit resource %08x.\n", handle );
FIXME("can't return SEGPTR to 32-bit resource %08x.\n", handle );
else
bits = (LPVOID)handle;
}
......@@ -422,7 +423,7 @@ static BOOL RES_FreeResource( HGLOBAL handle )
{
HGLOBAL retv = handle;
TRACE_(resource)("(%08x)\n", handle );
TRACE("(%08x)\n", handle );
if ( HIWORD( handle ) )
{
......@@ -862,8 +863,8 @@ INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id,
int string_num;
int i;
TRACE_(resource)("inst=%04x id=%04x buff=%08x len=%d\n",
instance, resource_id, (int) buffer, buflen);
TRACE("inst=%04x id=%04x buff=%08x len=%d\n",
instance, resource_id, (int) buffer, buflen);
hrsrc = FindResource16( instance, (SEGPTR)((resource_id>>4)+1), RT_STRING16 );
if (!hrsrc) return 0;
......@@ -875,7 +876,7 @@ INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id,
for (i = 0; i < string_num; i++)
p += *p + 1;
TRACE_(resource)("strlen = %d\n", (int)*p );
TRACE("strlen = %d\n", (int)*p );
if (buffer == NULL) return *p;
i = MIN(buflen - 1, *p);
......@@ -887,11 +888,11 @@ INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id,
buffer[0] = '\0';
return 0;
}
WARN_(resource)("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
WARN("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
}
FreeResource16( hmem );
TRACE_(resource)("'%s' loaded !\n", buffer);
TRACE("'%s' loaded !\n", buffer);
return i;
}
......@@ -909,8 +910,8 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
resource_id = (UINT)(-((INT)resource_id));
TRACE_(resource)("instance = %04x, id = %04x, buffer = %08x, "
"length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
TRACE("instance = %04x, id = %04x, buffer = %08x, "
"length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
/* Use bits 4 - 19 (incremented by 1) as resourceid, mask out
* 20 - 31. */
......@@ -925,7 +926,7 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
for (i = 0; i < string_num; i++)
p += *p + 1;
TRACE_(resource)("strlen = %d\n", (int)*p );
TRACE("strlen = %d\n", (int)*p );
if (buffer == NULL) return *p;
i = MIN(buflen - 1, *p);
......@@ -938,11 +939,11 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
return 0;
}
#if 0
WARN_(resource)("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
WARN("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
#endif
}
TRACE_(resource)("%s loaded !\n", debugstr_w(buffer));
TRACE("%s loaded !\n", debugstr_w(buffer));
return i;
}
......@@ -1006,7 +1007,7 @@ INT WINAPI LoadMessageA( HMODULE instance, UINT id, WORD lang,
PMESSAGE_RESOURCE_ENTRY mre;
int i,slen;
TRACE_(resource)("instance = %08lx, id = %08lx, buffer = %p, length = %ld\n", (DWORD)instance, (DWORD)id, buffer, (DWORD)buflen);
TRACE("instance = %08lx, id = %08lx, buffer = %p, length = %ld\n", (DWORD)instance, (DWORD)id, buffer, (DWORD)buflen);
/*FIXME: I am not sure about the '1' ... But I've only seen those entries*/
hrsrc = FindResourceExW(instance,RT_MESSAGELISTW,(LPWSTR)1,lang);
......@@ -1033,7 +1034,7 @@ INT WINAPI LoadMessageA( HMODULE instance, UINT id, WORD lang,
mre = (PMESSAGE_RESOURCE_ENTRY)(((char*)mre)+(mre->Length));
}
slen=mre->Length;
TRACE_(resource)(" - strlen=%d\n",slen);
TRACE(" - strlen=%d\n",slen);
i = MIN(buflen - 1, slen);
if (buffer == NULL)
return slen;
......@@ -1047,7 +1048,7 @@ INT WINAPI LoadMessageA( HMODULE instance, UINT id, WORD lang,
}
}
if (buffer)
TRACE_(resource)("'%s' copied !\n", buffer);
TRACE("'%s' copied !\n", buffer);
return i;
}
......
loader/task.c
View file @ dd03cc19
......@@ -37,8 +37,8 @@
#include "services.h"
#include "server.h"
DEFAULT_DEBUG_CHANNEL(task)
DECLARE_DEBUG_CHANNEL(relay)
DECLARE_DEBUG_CHANNEL(task)
DECLARE_DEBUG_CHANNEL(toolhelp)
/* Min. number of thunks allocated when creating a new segment */
......@@ -254,10 +254,10 @@ void TASK_CallToStart(void)
EDI_reg(&context) = pTask->hInstance;
ESI_reg(&context) = pTask->hPrevInstance;
TRACE_(task)("Starting main program: cs:ip=%04lx:%04lx ds=%04lx ss:sp=%04x:%04x\n",
CS_reg(&context), EIP_reg(&context), DS_reg(&context),
SELECTOROF(pTask->teb->cur_stack),
OFFSETOF(pTask->teb->cur_stack) );
TRACE("Starting main program: cs:ip=%04lx:%04lx ds=%04lx ss:sp=%04x:%04x\n",
CS_reg(&context), EIP_reg(&context), DS_reg(&context),
SELECTOROF(pTask->teb->cur_stack),
OFFSETOF(pTask->teb->cur_stack) );
Callbacks->CallRegisterShortProc( &context, 0 );
}
......@@ -382,7 +382,7 @@ BOOL TASK_Create( NE_MODULE *pModule, UINT16 cmdShow)
/* Enter task handle into thread and process */
pTask->teb->htask16 = pTask->teb->process->task = hTask;
TRACE_(task)("module='%s' cmdline='%s' task=%04x\n", name, cmd_line, hTask );
TRACE("module='%s' cmdline='%s' task=%04x\n", name, cmd_line, hTask );
/* Add the task to the linked list */
......@@ -448,7 +448,7 @@ void TASK_KillTask( HTASK16 hTask )
return;
}
TRACE_(task)("Killing task %04x\n", hTask );
TRACE("Killing task %04x\n", hTask );
#ifdef MZ_SUPPORTED
{
......@@ -468,7 +468,7 @@ void TASK_KillTask( HTASK16 hTask )
if (nTaskCount <= 1)
{
TRACE_(task)("this is the last task, exiting\n" );
TRACE("this is the last task, exiting\n" );
ExitKernel16();
}
......@@ -572,8 +572,8 @@ void TASK_Reschedule(void)
/* Check what we need to do */
hOldTask = GetCurrentTask();
pOldTask = (TDB *)GlobalLock16( hOldTask );
TRACE_(task)( "entered with hCurrentTask %04x by hTask %04x (pid %ld)\n",
hCurrentTask, hOldTask, (long) getpid() );
TRACE( "entered with hCurrentTask %04x by hTask %04x (pid %ld)\n",
hCurrentTask, hOldTask, (long) getpid() );
if ( pOldTask && THREAD_IsWin16( NtCurrentTeb() ) )
{
......@@ -624,8 +624,7 @@ void TASK_Reschedule(void)
{
pNewTask = (TDB *)GlobalLock16( hNewTask );
TRACE_(task)( "\ttask = %04x, events = %i\n",
hNewTask, pNewTask->nEvents );
TRACE( "\ttask = %04x, events = %i\n", hNewTask, pNewTask->nEvents );
if (pNewTask->nEvents) break;
hNewTask = pNewTask->hNext;
......@@ -636,7 +635,7 @@ void TASK_Reschedule(void)
/* If we are still the task with highest priority, just return ... */
if ( mode == MODE_YIELD && hNewTask == hCurrentTask )
{
TRACE_(task)("returning to the current task (%04x)\n", hCurrentTask );
TRACE("returning to the current task (%04x)\n", hCurrentTask );
SYSLEVEL_LeaveWin16Lock();
/* Allow Win32 threads to thunk down even while a Win16 task is
......@@ -649,14 +648,14 @@ void TASK_Reschedule(void)
/* If no task to yield to found, suspend 16-bit scheduler ... */
if ( mode == MODE_YIELD && !hNewTask )
{
TRACE_(task)("No currently active task\n");
TRACE("No currently active task\n");
hCurrentTask = 0;
}
/* If we found a task to wake up, do it ... */
if ( (mode == MODE_YIELD || mode == MODE_WAKEUP) && hNewTask )
{
TRACE_(task)("Switching to task %04x (%.8s)\n",
TRACE("Switching to task %04x (%.8s)\n",
hNewTask, pNewTask->module_name );
pNewTask->priority++;
......@@ -761,7 +760,7 @@ BOOL16 WINAPI WaitEvent16( HTASK16 hTask )
if ( !THREAD_IsWin16( NtCurrentTeb() ) )
{
FIXME_(task)("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
FIXME("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
return TRUE;
}
......@@ -791,7 +790,7 @@ void WINAPI PostEvent16( HTASK16 hTask )
if ( !THREAD_IsWin16( pTask->teb ) )
{
FIXME_(task)("called for Win32 thread (%04x)!\n", pTask->teb->teb_sel );
FIXME("called for Win32 thread (%04x)!\n", pTask->teb->teb_sel );
return;
}
......@@ -853,7 +852,7 @@ void WINAPI OldYield16(void)
if ( !THREAD_IsWin16( NtCurrentTeb() ) )
{
FIXME_(task)("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
FIXME("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
return;
}
......@@ -882,16 +881,16 @@ void WINAPI DirectedYield16( HTASK16 hTask )
if ( !THREAD_IsWin16( NtCurrentTeb() ) )
{
FIXME_(task)("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
FIXME("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
return;
}
TRACE_(task)("%04x: DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
TRACE("%04x: DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
pCurTask->hYieldTo = hTask;
OldYield16();
TRACE_(task)("%04x: back from DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
TRACE("%04x: back from DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
}
/***********************************************************************
......@@ -913,7 +912,7 @@ HTASK16 WINAPI KERNEL_490( HTASK16 someTask )
{
if ( !someTask ) return 0;
FIXME_(task)("(%04x): stub\n", someTask );
FIXME("(%04x): stub\n", someTask );
return 0;
}
......@@ -926,12 +925,12 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
SEGPTR thunkaddr;
if (!func) {
ERR_(task)("Ouch ! MakeProcInstance called with func == NULL !\n");
ERR("Ouch ! MakeProcInstance called with func == NULL !\n");
return (FARPROC16)0; /* Windows seems to do the same */
}
if ( GetTaskDS16() !=hInstance )
{
ERR_(task)("Problem with hInstance? Got %04x, using %04x instead\n",
ERR("Problem with hInstance? Got %04x, using %04x instead\n",
hInstance,GetTaskDS16());
hInstance = GetTaskDS16();
}
......@@ -941,12 +940,12 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
thunk = PTR_SEG_TO_LIN( thunkaddr );
lfunc = PTR_SEG_TO_LIN( func );
TRACE_(task)("(%08lx,%04x): got thunk %08lx\n",
(DWORD)func, hInstance, (DWORD)thunkaddr );
TRACE("(%08lx,%04x): got thunk %08lx\n",
(DWORD)func, hInstance, (DWORD)thunkaddr );
if (((lfunc[0]==0x8c) && (lfunc[1]==0xd8)) ||
((lfunc[0]==0x1e) && (lfunc[1]==0x58))
) {
FIXME_(task)("thunk would be useless for %p, overwriting with nop;nop;\n", func );
FIXME("thunk would be useless for %p, overwriting with nop;nop;\n", func );
lfunc[0]=0x90; /* nop */
lfunc[1]=0x90; /* nop */
}
......@@ -965,7 +964,7 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
*/
void WINAPI FreeProcInstance16( FARPROC16 func )
{
TRACE_(task)("(%08lx)\n", (DWORD)func );
TRACE("(%08lx)\n", (DWORD)func );
TASK_FreeThunk( GetCurrentTask(), (SEGPTR)func );
}
......@@ -1185,7 +1184,7 @@ HANDLE WINAPI GetFastQueue16( void )
Callout.InitThreadInput16( 0, THREAD_IsWin16(teb)? 4 : 5 );
if (!teb->queue)
FIXME_(task)("(): should initialize thread-local queue, expect failure!\n" );
FIXME("(): should initialize thread-local queue, expect failure!\n" );
return (HANDLE)teb->queue;
}
......@@ -1202,9 +1201,9 @@ void WINAPI SwitchStackTo16( WORD seg, WORD ptr, WORD top )
if (!(pTask = (TDB *)GlobalLock16( GetCurrentTask() ))) return;
if (!(pData = (INSTANCEDATA *)GlobalLock16( seg ))) return;
TRACE_(task)("old=%04x:%04x new=%04x:%04x\n",
SELECTOROF( pTask->teb->cur_stack ),
OFFSETOF( pTask->teb->cur_stack ), seg, ptr );
TRACE("old=%04x:%04x new=%04x:%04x\n",
SELECTOROF( pTask->teb->cur_stack ),
OFFSETOF( pTask->teb->cur_stack ), seg, ptr );
/* Save the old stack */
......@@ -1247,11 +1246,11 @@ void WINAPI SwitchStackBack16( CONTEXT86 *context )
return;
if (!pData->old_ss_sp)
{
WARN_(task)("No previous SwitchStackTo\n" );
WARN("No previous SwitchStackTo\n" );
return;
}
TRACE_(task)("restoring stack %04x:%04x\n",
SELECTOROF(pData->old_ss_sp), OFFSETOF(pData->old_ss_sp) );
TRACE("restoring stack %04x:%04x\n",
SELECTOROF(pData->old_ss_sp), OFFSETOF(pData->old_ss_sp) );
oldFrame = CURRENT_STACK16;
......@@ -1480,7 +1479,7 @@ void TASK_CallTaskSignalProc( UINT16 uCode, HANDLE16 hTaskOrModule )
WORD WINAPI SetSigHandler16( FARPROC16 newhandler, FARPROC16* oldhandler,
UINT16 *oldmode, UINT16 newmode, UINT16 flag )
{
FIXME_(task)("(%p,%p,%p,%d,%d), unimplemented.\n",
FIXME("(%p,%p,%p,%d,%d), unimplemented.\n",
newhandler,oldhandler,oldmode,newmode,flag );
if (flag != 1) return 0;
......
memory/instr.c
View file @ dd03cc19
......@@ -13,7 +13,7 @@
#include "selectors.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(int)
DEFAULT_DEBUG_CHANNEL(int)
DECLARE_DEBUG_CHANNEL(io)
#ifdef __i386__
......@@ -75,7 +75,7 @@ static BOOL INSTR_ReplaceSelector( CONTEXT86 *context, WORD *sel )
return TRUE;
}
if (!IS_SELECTOR_SYSTEM(*sel) && !IS_SELECTOR_FREE(*sel))
ERR_(int)("Got protection fault on valid selector, maybe your kernel is too old?\n" );
ERR("Got protection fault on valid selector, maybe your kernel is too old?\n" );
return FALSE; /* Can't replace selector, crashdump */
}
......@@ -672,7 +672,7 @@ BOOL INSTR_EmulateInstruction( CONTEXT86 *context )
case 0xcd: /* int <XX> */
if (long_op)
{
ERR_(int)("int xx from 32-bit code is not supported.\n");
ERR("int xx from 32-bit code is not supported.\n");
break; /* Unable to emulate it */
}
else
......
memory/local.c
View file @ dd03cc19
......@@ -27,8 +27,8 @@
#include "debugtools.h"
#include "callback.h"
DECLARE_DEBUG_CHANNEL(heap)
DEFAULT_DEBUG_CHANNEL(local)
DECLARE_DEBUG_CHANNEL(heap)
typedef struct
{
......
msdos/dosmem.c
View file @ dd03cc19
......@@ -18,7 +18,7 @@
#include "task.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(dosmem)
DEFAULT_DEBUG_CHANNEL(dosmem)
DECLARE_DEBUG_CHANNEL(selector)
HANDLE16 DOSMEM_BiosDataSeg; /* BIOS data segment at 0x40:0 */
......@@ -422,7 +422,7 @@ BOOL DOSMEM_Init(HMODULE16 hModule)
PAGE_EXECUTE_READWRITE );
if (!DOSMEM_dosmem)
{
WARN_(dosmem)("Could not allocate DOS memory.\n" );
WARN("Could not allocate DOS memory.\n" );
return FALSE;
}
DOSMEM_BiosDataSeg = GLOBAL_CreateBlock(GMEM_FIXED,DOSMEM_dosmem+0x400,
......@@ -489,7 +489,7 @@ LPVOID DOSMEM_GetBlock(HMODULE16 hModule, UINT size, UINT16* pseg)
#ifdef __DOSMEM_DEBUG__
if( (dm->size & DM_BLOCK_DEBUG) != DM_BLOCK_DEBUG )
{
WARN_(dosmem)("MCB overrun! [prev = 0x%08x]\n", 4 + (UINT)prev);
WARN("MCB overrun! [prev = 0x%08x]\n", 4 + (UINT)prev);
return NULL;
}
prev = dm;
......@@ -671,7 +671,7 @@ UINT DOSMEM_Available(HMODULE16 hModule)
#ifdef __DOSMEM_DEBUG__
if( (dm->size & DM_BLOCK_DEBUG) != DM_BLOCK_DEBUG )
{
WARN_(dosmem)("MCB overrun! [prev = 0x%08x]\n", 4 + (UINT)prev);
WARN("MCB overrun! [prev = 0x%08x]\n", 4 + (UINT)prev);
return NULL;
}
prev = dm;
......@@ -733,8 +733,7 @@ LPVOID DOSMEM_MapRealToLinear(DWORD x)
LPVOID lin;
lin=DOSMEM_MemoryBase(0)+(x&0xffff)+(((x&0xffff0000)>>16)*16);
TRACE_(selector)("(0x%08lx) returns 0x%p.\n",
x,lin );
TRACE_(selector)("(0x%08lx) returns 0x%p.\n", x, lin );
return lin;
}
......@@ -752,9 +751,7 @@ WORD DOSMEM_AllocSelector(WORD realsel)
GMEM_FIXED,DOSMEM_dosmem+realsel*16,0x10000,
hModule,FALSE,FALSE,FALSE,NULL
);
TRACE_(selector)("(0x%04x) returns 0x%04x.\n",
realsel,sel
);
TRACE_(selector)("(0x%04x) returns 0x%04x.\n", realsel,sel);
return sel;
}
objects/bitmap.c
View file @ dd03cc19
......@@ -19,7 +19,7 @@
#include "monitor.h"
#include "wine/winuser16.h"
DECLARE_DEBUG_CHANNEL(bitmap)
DEFAULT_DEBUG_CHANNEL(bitmap)
DECLARE_DEBUG_CHANNEL(resource)
BITMAP_DRIVER *BITMAP_Driver = NULL;
......@@ -54,7 +54,7 @@ INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp )
return 2 * ((bmWidth+3) >> 2);
default:
WARN_(bitmap)("Unknown depth %d, please report.\n", bpp );
WARN("Unknown depth %d, please report.\n", bpp );
}
return -1;
}
......@@ -115,7 +115,7 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes,
/* Check parameters */
if (!height || !width) return 0;
if (planes != 1) {
FIXME_(bitmap)("planes = %d\n", planes);
FIXME("planes = %d\n", planes);
return 0;
}
if (height < 0) height = -height;
......@@ -125,7 +125,7 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes,
hbitmap = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC );
if (!hbitmap) return 0;
TRACE_(bitmap)("%dx%d, %d colors returning %08x\n", width, height,
TRACE("%dx%d, %d colors returning %08x\n", width, height,
1 << (planes*bpp), hbitmap);
bmp = (BITMAPOBJ *) GDI_HEAP_LOCK( hbitmap );
......@@ -177,10 +177,10 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
HBITMAP hbmpRet = 0;
DC *dc;
TRACE_(bitmap)("(%04x,%d,%d) = \n", hdc, width, height );
TRACE("(%04x,%d,%d) = \n", hdc, width, height );
if (!(dc = DC_GetDCPtr( hdc ))) return 0;
if ((width >= 0x10000) || (height >= 0x10000)) {
FIXME_(bitmap)("got bad width %d or height %d, please look for reason\n",
FIXME("got bad width %d or height %d, please look for reason\n",
width, height );
} else {
/* MS doc says if width or height is 0, return 1-by-1 pixel, monochrome bitmap */
......@@ -191,7 +191,7 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
if(dc->funcs->pCreateBitmap)
dc->funcs->pCreateBitmap( hbmpRet );
}
TRACE_(bitmap)("\t\t%04x\n", hbmpRet);
TRACE("\t\t%04x\n", hbmpRet);
GDI_HEAP_UNLOCK(hdc);
return hbmpRet;
}
......@@ -253,7 +253,7 @@ LONG WINAPI GetBitmapBits(
return bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight;
if (count < 0) {
WARN_(bitmap)("(%ld): Negative number of bytes passed???\n", count );
WARN("(%ld): Negative number of bytes passed???\n", count );
count = -count;
}
......@@ -263,31 +263,31 @@ LONG WINAPI GetBitmapBits(
count = height * bmp->bitmap.bmWidthBytes;
if (count == 0)
{
WARN_(bitmap)("Less then one entire line requested\n");
WARN("Less then one entire line requested\n");
GDI_HEAP_UNLOCK( hbitmap );
return 0;
}
TRACE_(bitmap)("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height );
TRACE("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height );
if(bmp->DDBitmap) {
TRACE_(bitmap)("Calling device specific BitmapBits\n");
TRACE("Calling device specific BitmapBits\n");
if(bmp->DDBitmap->funcs->pBitmapBits)
ret = bmp->DDBitmap->funcs->pBitmapBits(hbitmap, bits, count,
DDB_GET);
else {
ERR_(bitmap)("BitmapBits == NULL??\n");
ERR("BitmapBits == NULL??\n");
ret = 0;
}
} else {
if(!bmp->bitmap.bmBits) {
WARN_(bitmap)("Bitmap is empty\n");
WARN("Bitmap is empty\n");
ret = 0;
} else {
memcpy(bits, bmp->bitmap.bmBits, count);
......@@ -329,7 +329,7 @@ LONG WINAPI SetBitmapBits(
return 0;
if (count < 0) {
WARN_(bitmap)("(%ld): Negative number of bytes passed???\n", count );
WARN("(%ld): Negative number of bytes passed???\n", count );
count = -count;
}
......@@ -338,18 +338,18 @@ LONG WINAPI SetBitmapBits(
if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight;
count = height * bmp->bitmap.bmWidthBytes;
TRACE_(bitmap)("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height );
TRACE("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height );
if(bmp->DDBitmap) {
TRACE_(bitmap)("Calling device specific BitmapBits\n");
TRACE("Calling device specific BitmapBits\n");
if(bmp->DDBitmap->funcs->pBitmapBits)
ret = bmp->DDBitmap->funcs->pBitmapBits(hbitmap, (void *) bits,
count, DDB_SET);
else {
ERR_(bitmap)("BitmapBits == NULL??\n");
ERR("BitmapBits == NULL??\n");
ret = 0;
}
......@@ -358,7 +358,7 @@ LONG WINAPI SetBitmapBits(
if(!bmp->bitmap.bmBits) /* Alloc enough for entire bitmap */
bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), 0, count );
if(!bmp->bitmap.bmBits) {
WARN_(bitmap)("Unable to allocate bit buffer\n");
WARN("Unable to allocate bit buffer\n");
ret = 0;
} else {
memcpy(bmp->bitmap.bmBits, bits, count);
......@@ -684,7 +684,7 @@ INT16 BITMAP_GetObject16( BITMAPOBJ * bmp, INT16 count, LPVOID buffer )
}
else
{
FIXME_(bitmap)("not implemented for DIBs: count %d\n", count);
FIXME("not implemented for DIBs: count %d\n", count);
return 0;
}
}
......
objects/clipping.c
View file @ dd03cc19
......@@ -10,7 +10,7 @@
#include "debugtools.h"
#include "wine/winuser16.h"
DECLARE_DEBUG_CHANNEL(clipping)
DEFAULT_DEBUG_CHANNEL(clipping)
DECLARE_DEBUG_CHANNEL(region)
#define UPDATE_DIRTY_DC(dc) \
......@@ -84,7 +84,7 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return ERROR;
TRACE_(clipping)("%04x %04x %d\n", hdc, hrgn, fnMode );
TRACE("%04x %04x %d\n", hdc, hrgn, fnMode );
if (!hrgn)
{
......@@ -96,7 +96,7 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
}
else
{
FIXME_(clipping)("Unimplemented: hrgn NULL in mode: %d\n", fnMode);
FIXME("Unimplemented: hrgn NULL in mode: %d\n", fnMode);
return ERROR;
}
}
......@@ -132,7 +132,7 @@ INT16 WINAPI SelectVisRgn16( HDC16 hdc, HRGN16 hrgn )
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc || !hrgn) return ERROR;
TRACE_(clipping)("%04x %04x\n", hdc, hrgn );
TRACE("%04x %04x\n", hdc, hrgn );
dc->w.flags &= ~DC_DIRTY;
......@@ -161,7 +161,7 @@ INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y )
DC *dc = DC_GetDCPtr( hdc );
if (!dc) return ERROR;
TRACE_(clipping)("%04x %d,%d\n", hdc, x, y );
TRACE("%04x %d,%d\n", hdc, x, y );
if(dc->funcs->pOffsetClipRgn)
ret = dc->funcs->pOffsetClipRgn( dc, x, y );
......@@ -182,7 +182,7 @@ INT16 WINAPI OffsetVisRgn16( HDC16 hdc, INT16 x, INT16 y )
INT16 retval;
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return ERROR;
TRACE_(clipping)("%04x %d,%d\n", hdc, x, y );
TRACE("%04x %d,%d\n", hdc, x, y );
retval = OffsetRgn( dc->w.hVisRgn, x, y );
CLIPPING_UpdateGCRegion( dc );
GDI_HEAP_UNLOCK( hdc );
......@@ -222,7 +222,7 @@ INT CLIPPING_IntersectClipRect( DC * dc, INT left, INT top,
dc->w.hClipRgn = CreateRectRgn( 0, 0, 0, 0 );
CombineRgn( dc->w.hClipRgn, dc->w.hVisRgn, 0, RGN_COPY );
}
else WARN_(clipping)("No hClipRgn and flags are %x\n",flags);
else WARN("No hClipRgn and flags are %x\n",flags);
}
ret = CombineRgn( newRgn, dc->w.hClipRgn, newRgn,
......@@ -258,8 +258,7 @@ INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top,
DC *dc = DC_GetDCPtr( hdc );
if (!dc) return ERROR;
TRACE_(clipping)("%04x %dx%d,%dx%d\n",
hdc, left, top, right, bottom );
TRACE("%04x %dx%d,%dx%d\n", hdc, left, top, right, bottom );
if(dc->funcs->pExcludeClipRect)
ret = dc->funcs->pExcludeClipRect( dc, left, top, right, bottom );
......@@ -296,8 +295,7 @@ INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top,
DC *dc = DC_GetDCPtr( hdc );
if (!dc) return ERROR;
TRACE_(clipping)("%04x %dx%d,%dx%d\n",
hdc, left, top, right, bottom );
TRACE("%04x %dx%d,%dx%d\n", hdc, left, top, right, bottom );
if(dc->funcs->pIntersectClipRect)
ret = dc->funcs->pIntersectClipRect( dc, left, top, right, bottom );
......@@ -372,8 +370,7 @@ INT16 WINAPI ExcludeVisRect16( HDC16 hdc, INT16 left, INT16 top,
top = YLPTODP( dc, top );
bottom = YLPTODP( dc, bottom );
TRACE_(clipping)("%04x %dx%d,%dx%d\n",
hdc, left, top, right, bottom );
TRACE("%04x %dx%d,%dx%d\n", hdc, left, top, right, bottom );
return CLIPPING_IntersectVisRect( dc, left, top, right, bottom, TRUE );
}
......@@ -393,8 +390,7 @@ INT16 WINAPI IntersectVisRect16( HDC16 hdc, INT16 left, INT16 top,
top = YLPTODP( dc, top );
bottom = YLPTODP( dc, bottom );
TRACE_(clipping)("%04x %dx%d,%dx%d\n",
hdc, left, top, right, bottom );
TRACE("%04x %dx%d,%dx%d\n", hdc, left, top, right, bottom );
return CLIPPING_IntersectVisRect( dc, left, top, right, bottom, FALSE );
}
......@@ -417,7 +413,7 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y )
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return ERROR;
TRACE_(clipping)("%04x %d,%d\n", hdc, x, y );
TRACE("%04x %d,%d\n", hdc, x, y );
if (!dc->w.hGCClipRgn) return FALSE;
if( dc->w.flags & DC_DIRTY ) UPDATE_DIRTY_DC(dc);
......@@ -436,8 +432,8 @@ BOOL16 WINAPI RectVisible16( HDC16 hdc, const RECT16* rect )
RECT16 tmpRect;
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return FALSE;
TRACE_(clipping)("%04x %d,%dx%d,%d\n",
hdc, rect->left, rect->top, rect->right, rect->bottom );
TRACE("%04x %d,%dx%d,%d\n",
hdc, rect->left, rect->top, rect->right, rect->bottom );
if (!dc->w.hGCClipRgn) return FALSE;
/* copy rectangle to avoid overwriting by LPtoDP */
tmpRect = *rect;
......@@ -469,8 +465,7 @@ INT16 WINAPI GetClipBox16( HDC16 hdc, LPRECT16 rect )
ret = GetRgnBox16( dc->w.hGCClipRgn, rect );
OffsetRect16( rect, -dc->w.DCOrgX, -dc->w.DCOrgY );
DPtoLP16( hdc, (LPPOINT16)rect, 2 );
TRACE_(clipping)("%d,%d-%d,%d\n",
rect->left,rect->top,rect->right,rect->bottom );
TRACE("%d,%d-%d,%d\n", rect->left,rect->top,rect->right,rect->bottom );
return ret;
}
......@@ -523,7 +518,7 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc )
RGNOBJ *obj, *copyObj;
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return 0;
TRACE_(clipping)("%04x\n", hdc );
TRACE("%04x\n", hdc );
if (!dc->w.hVisRgn)
{
ERR_(region)("hVisRgn is zero. Please report this.\n" );
......@@ -575,7 +570,7 @@ INT16 WINAPI RestoreVisRgn16( HDC16 hdc )
GDI_HEAP_UNLOCK( hdc );
return ERROR;
}
TRACE_(clipping)("%04x\n", hdc );
TRACE("%04x\n", hdc );
if (!(obj = (RGNOBJ *) GDI_GetObjPtr( dc->w.hVisRgn, REGION_MAGIC )))
{
GDI_HEAP_UNLOCK( hdc );
......
scheduler/critsection.c
View file @ dd03cc19
......@@ -40,7 +40,7 @@ void WINAPI DeleteCriticalSection( CRITICAL_SECTION *crit )
if (crit->LockSemaphore)
{
if (crit->RecursionCount) /* Should not happen */
ERR_(win32)("Deleting owned critical section (%p)\n", crit );
ERR("Deleting owned critical section (%p)\n", crit );
crit->LockCount = -1;
crit->RecursionCount = 0;
......@@ -61,13 +61,13 @@ void WINAPI EnterCriticalSection( CRITICAL_SECTION *crit )
if (!crit->LockSemaphore)
{
FIXME_(win32)("entering uninitialized section(%p)?\n",crit);
FIXME("entering uninitialized section(%p)?\n",crit);
InitializeCriticalSection(crit);
}
if ( crit->Reserved && crit->Reserved != GetCurrentProcessId() )
{
FIXME_(win32)("Crst %p belongs to process %ld, current is %ld!\n",
crit, crit->Reserved, GetCurrentProcessId() );
FIXME("Crst %p belongs to process %ld, current is %ld!\n",
crit, crit->Reserved, GetCurrentProcessId() );
return;
}
if (InterlockedIncrement( &crit->LockCount ))
......@@ -86,11 +86,11 @@ void WINAPI EnterCriticalSection( CRITICAL_SECTION *crit )
res = WaitForSingleObject( crit->LockSemaphore, 5000L );
if ( res == WAIT_TIMEOUT )
{
ERR_(win32)("Critical section %p wait timed out, retrying (60 sec)\n", crit );
ERR("Critical section %p wait timed out, retrying (60 sec)\n", crit );
res = WaitForSingleObject( crit->LockSemaphore, 60000L );
if ( res == WAIT_TIMEOUT && TRACE_ON(relay) )
{
ERR_(win32)("Critical section %p wait timed out, retrying (5 min)\n", crit );
ERR("Critical section %p wait timed out, retrying (5 min)\n", crit );
res = WaitForSingleObject( crit->LockSemaphore, 300000L );
}
}
......@@ -173,8 +173,8 @@ void WINAPI ReinitializeCriticalSection( CRITICAL_SECTION *crit )
else if ( crit->Reserved && crit->Reserved != GetCurrentProcessId() )
{
FIXME_(win32)("(%p) called for %08lx first, %08lx now: making global\n",
crit, crit->Reserved, GetCurrentProcessId() );
FIXME("(%p) called for %08lx first, %08lx now: making global\n",
crit, crit->Reserved, GetCurrentProcessId() );
MakeCriticalSectionGlobal( crit );
}
......@@ -191,8 +191,8 @@ void WINAPI UninitializeCriticalSection( CRITICAL_SECTION *crit )
if ( crit->Reserved ) /* not global */
DeleteCriticalSection( crit );
else
FIXME_(win32)("(%p) for %08lx: Crst is global, don't know whether to delete\n",
crit, GetCurrentProcessId() );
FIXME("(%p) for %08lx: Crst is global, don't know whether to delete\n",
crit, GetCurrentProcessId() );
}
}
scheduler/debugger.c
View file @ dd03cc19
......@@ -11,7 +11,7 @@
#include "server.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(debugstr)
DEFAULT_DEBUG_CHANNEL(debugstr)
/**********************************************************************
* DEBUG_SendEvent
......@@ -258,7 +258,7 @@ void WINAPI OutputDebugStringA( LPCSTR str )
DEBUG_SendEvent( OUTPUT_DEBUG_STRING_EVENT, &event, sizeof(event) );
}
TRACE_(debugstr)("%s\n", str);
TRACE("%s\n", str);
}
......@@ -276,7 +276,7 @@ void WINAPI OutputDebugStringW( LPCWSTR str )
DEBUG_SendEvent( OUTPUT_DEBUG_STRING_EVENT, &event, sizeof(event) );
}
TRACE_(debugstr)("%s\n", debugstr_w(str));
TRACE("%s\n", debugstr_w(str));
}
......
scheduler/process.c
View file @ dd03cc19
......@@ -27,7 +27,7 @@
#include "callback.h"
#include "debugtools.h"
DECLARE_DEBUG_CHANNEL(process)
DEFAULT_DEBUG_CHANNEL(process)
DECLARE_DEBUG_CHANNEL(relay)
DECLARE_DEBUG_CHANNEL(win32)
......@@ -604,7 +604,7 @@ PDB *PROCESS_Create( NE_MODULE *pModule, LPCSTR cmd_line, LPCSTR env,
switch ( WaitForMultipleObjects( 2, handles, FALSE, INFINITE ) )
{
default:
ERR_(process)( "WaitForMultipleObjects failed\n" );
ERR( "WaitForMultipleObjects failed\n" );
break;
case 0:
......@@ -994,7 +994,7 @@ DWORD WINAPI GetProcessFlags( DWORD processid )
BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess,DWORD minset,
DWORD maxset)
{
FIXME_(process)("(0x%08x,%ld,%ld): stub - harmless\n",hProcess,minset,maxset);
FIXME("(0x%08x,%ld,%ld): stub - harmless\n",hProcess,minset,maxset);
if(( minset == -1) && (maxset == -1)) {
/* Trim the working set to zero */
/* Swap the process out of physical RAM */
......@@ -1008,7 +1008,7 @@ BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess,DWORD minset,
BOOL WINAPI GetProcessWorkingSetSize(HANDLE hProcess,LPDWORD minset,
LPDWORD maxset)
{
FIXME_(process)("(0x%08x,%p,%p): stub\n",hProcess,minset,maxset);
FIXME("(0x%08x,%p,%p): stub\n",hProcess,minset,maxset);
/* 32 MB working set size */
if (minset) *minset = 32*1024*1024;
if (maxset) *maxset = 32*1024*1024;
......@@ -1036,7 +1036,7 @@ BOOL WINAPI SetProcessShutdownParameters(DWORD level,DWORD flags)
shutdown_priority = level;
else
{
ERR_(process)("invalid priority level 0x%08lx\n", level);
ERR("invalid priority level 0x%08lx\n", level);
return FALSE;
}
return TRUE;
......@@ -1059,7 +1059,7 @@ BOOL WINAPI GetProcessShutdownParameters( LPDWORD lpdwLevel,
*/
BOOL WINAPI SetProcessPriorityBoost(HANDLE hprocess,BOOL disableboost)
{
FIXME_(process)("(%d,%d): stub\n",hprocess,disableboost);
FIXME("(%d,%d): stub\n",hprocess,disableboost);
/* Say we can do it. I doubt the program will notice that we don't. */
return TRUE;
}
......
win32/kernel32.c
View file @ dd03cc19
......@@ -26,8 +26,8 @@
#include "syslevel.h"
#include "winerror.h"
DECLARE_DEBUG_CHANNEL(dosmem)
DECLARE_DEBUG_CHANNEL(thunk)
DECLARE_DEBUG_CHANNEL(dosmem)
DECLARE_DEBUG_CHANNEL(win32)
......
win32/newfns.c
View file @ dd03cc19
......@@ -16,8 +16,8 @@ at a later date. */
#include "debugtools.h"
#include "debugstr.h"
DEFAULT_DEBUG_CHANNEL(win32)
DECLARE_DEBUG_CHANNEL(debug)
DECLARE_DEBUG_CHANNEL(win32)
/****************************************************************************
......@@ -60,10 +60,9 @@ HANDLE WINAPI CreateNamedPipeA (LPCSTR lpName, DWORD dwOpenMode,
DWORD nDefaultTimeOut,
LPSECURITY_ATTRIBUTES lpSecurityAttributes)
{
FIXME_(win32)("(Name=%s, OpenMode=%#08lx, dwPipeMode=%#08lx, MaxInst=%ld, OutBSize=%ld, InBuffSize=%ld, DefTimeOut=%ld, SecAttr=%p): stub\n",
debugstr_a(lpName), dwOpenMode, dwPipeMode, nMaxInstances,
nOutBufferSize, nInBufferSize, nDefaultTimeOut,
lpSecurityAttributes);
FIXME("(Name=%s, OpenMode=%#08lx, dwPipeMode=%#08lx, MaxInst=%ld, OutBSize=%ld, InBuffSize=%ld, DefTimeOut=%ld, SecAttr=%p): stub\n",
debugstr_a(lpName), dwOpenMode, dwPipeMode, nMaxInstances,
nOutBufferSize, nInBufferSize, nDefaultTimeOut, lpSecurityAttributes);
/* if (nMaxInstances > PIPE_UNLIMITED_INSTANCES) {
SetLastError (ERROR_INVALID_PARAMETER);
return INVALID_HANDLE_VALUE;
......@@ -82,10 +81,9 @@ HANDLE WINAPI CreateNamedPipeW (LPCWSTR lpName, DWORD dwOpenMode,
DWORD nDefaultTimeOut,
LPSECURITY_ATTRIBUTES lpSecurityAttributes)
{
FIXME_(win32)("(Name=%s, OpenMode=%#08lx, dwPipeMode=%#08lx, MaxInst=%ld, OutBSize=%ld, InBuffSize=%ld, DefTimeOut=%ld, SecAttr=%p): stub\n",
debugstr_w(lpName), dwOpenMode, dwPipeMode, nMaxInstances,
nOutBufferSize, nInBufferSize, nDefaultTimeOut,
lpSecurityAttributes);
FIXME("(Name=%s, OpenMode=%#08lx, dwPipeMode=%#08lx, MaxInst=%ld, OutBSize=%ld, InBuffSize=%ld, DefTimeOut=%ld, SecAttr=%p): stub\n",
debugstr_w(lpName), dwOpenMode, dwPipeMode, nMaxInstances,
nOutBufferSize, nInBufferSize, nDefaultTimeOut, lpSecurityAttributes);
SetLastError (ERROR_UNKNOWN);
return INVALID_HANDLE_VALUE;
......@@ -128,7 +126,7 @@ BOOL WINAPI SetSystemPowerState(BOOL suspend_or_hibernate,
HANDLE WINAPI CreateMailslotA( LPCSTR lpName, DWORD nMaxMessageSize,
DWORD lReadTimeout, LPSECURITY_ATTRIBUTES sa)
{
FIXME_(win32)("(%s,%ld,%ld,%p): stub\n", debugstr_a(lpName),
FIXME("(%s,%ld,%ld,%p): stub\n", debugstr_a(lpName),
nMaxMessageSize, lReadTimeout, sa);
return 1;
}
......@@ -150,7 +148,7 @@ HANDLE WINAPI CreateMailslotA( LPCSTR lpName, DWORD nMaxMessageSize,
HANDLE WINAPI CreateMailslotW( LPCWSTR lpName, DWORD nMaxMessageSize,
DWORD lReadTimeout, LPSECURITY_ATTRIBUTES sa )
{
FIXME_(win32)("(%s,%ld,%ld,%p): stub\n", debugstr_w(lpName),
FIXME("(%s,%ld,%ld,%p): stub\n", debugstr_w(lpName),
nMaxMessageSize, lReadTimeout, sa);
return 1;
}
......@@ -174,7 +172,7 @@ BOOL WINAPI GetMailslotInfo( HANDLE hMailslot, LPDWORD lpMaxMessageSize,
LPDWORD lpNextSize, LPDWORD lpMessageCount,
LPDWORD lpReadTimeout )
{
FIXME_(win32)("(%04x): stub\n",hMailslot);
FIXME("(%04x): stub\n",hMailslot);
if (lpMaxMessageSize) *lpMaxMessageSize = (DWORD)NULL;
if (lpNextSize) *lpNextSize = (DWORD)NULL;
if (lpMessageCount) *lpMessageCount = (DWORD)NULL;
......@@ -193,7 +191,7 @@ DWORD WINAPI GetCompressedFileSizeA(
LPCSTR lpFileName,
LPDWORD lpFileSizeHigh)
{
FIXME_(win32)("(...): stub\n");
FIXME("(...): stub\n");
return 0xffffffff;
}
......@@ -209,7 +207,7 @@ DWORD WINAPI GetCompressedFileSizeW(
LPCWSTR lpFileName, /* [in] Pointer to name of file */
LPDWORD lpFileSizeHigh) /* [out] Receives high-order doubleword of size */
{
FIXME_(win32)("(%s,%p): stub\n",debugstr_w(lpFileName),lpFileSizeHigh);
FIXME("(%s,%p): stub\n",debugstr_w(lpFileName),lpFileSizeHigh);
return 0xffffffff;
}
......@@ -226,7 +224,7 @@ DWORD WINAPI GetCompressedFileSizeW(
*/
DWORD WINAPI GetProcessWindowStation(void)
{
FIXME_(win32)("(void): stub\n");
FIXME("(void): stub\n");
return 1;
}
......@@ -246,7 +244,7 @@ DWORD WINAPI GetProcessWindowStation(void)
*/
DWORD WINAPI GetThreadDesktop( DWORD dwThreadId )
{
FIXME_(win32)("(%lx): stub\n",dwThreadId);
FIXME("(%lx): stub\n",dwThreadId);
return 1;
}
......@@ -260,7 +258,7 @@ DWORD WINAPI GetThreadDesktop( DWORD dwThreadId )
*/
VOID WINAPI SetDebugErrorLevel( DWORD dwLevel )
{
FIXME_(win32)("(%ld): stub\n", dwLevel);
FIXME("(%ld): stub\n", dwLevel);
}
......@@ -286,13 +284,13 @@ BOOL WINAPI SetComputerNameA( LPCSTR lpComputerName )
*/
BOOL WINAPI SetComputerNameW( LPCWSTR lpComputerName )
{
FIXME_(win32)("(%s): stub\n", debugstr_w(lpComputerName));
FIXME("(%s): stub\n", debugstr_w(lpComputerName));
return TRUE;
}
BOOL WINAPI EnumPortsA(LPSTR name,DWORD level,LPBYTE ports,DWORD bufsize,LPDWORD bufneeded,LPDWORD bufreturned) {
FIXME_(win32)("(%s,%ld,%p,%ld,%p,%p), stub!\n",name,level,ports,bufsize,bufneeded,bufreturned);
FIXME("(%s,%ld,%p,%ld,%p,%p), stub!\n",name,level,ports,bufsize,bufneeded,bufreturned);
return FALSE;
}
......@@ -301,7 +299,7 @@ BOOL WINAPI EnumPortsA(LPSTR name,DWORD level,LPBYTE ports,DWORD bufsize,LPDWORD
*
*/
BOOL WINAPI IsDebuggerPresent() {
FIXME_(win32)(" ... no debuggers yet, returning FALSE.\n");
FIXME(" ... no debuggers yet, returning FALSE.\n");
return FALSE;
}
......@@ -316,7 +314,7 @@ BOOL WINAPI IsDebuggerPresent() {
HANDLE WINAPI OpenDesktopA( LPCSTR lpszDesktop, DWORD dwFlags,
BOOL fInherit, DWORD dwDesiredAccess )
{
FIXME_(win32)("(%s,%lx,%i,%lx): stub\n",debugstr_a(lpszDesktop),dwFlags,
FIXME("(%s,%lx,%i,%lx): stub\n",debugstr_a(lpszDesktop),dwFlags,
fInherit,dwDesiredAccess);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
......@@ -327,14 +325,14 @@ HANDLE WINAPI OpenDesktopA( LPCSTR lpszDesktop, DWORD dwFlags,
BOOL WINAPI SetUserObjectInformationA( HANDLE hObj, int nIndex,
LPVOID pvInfo, DWORD nLength )
{
FIXME_(win32)("(%x,%d,%p,%lx): stub\n",hObj,nIndex,pvInfo,nLength);
FIXME("(%x,%d,%p,%lx): stub\n",hObj,nIndex,pvInfo,nLength);
return TRUE;
}
BOOL WINAPI SetThreadDesktop( HANDLE hDesktop )
{
FIXME_(win32)("(%x): stub\n",hDesktop);
FIXME("(%x): stub\n",hDesktop);
return TRUE;
}
......@@ -342,7 +340,7 @@ HANDLE WINAPI CreateIoCompletionPort(HANDLE hFileHandle,
HANDLE hExistingCompletionPort, DWORD dwCompletionKey,
DWORD dwNumberOfConcurrentThreads)
{
FIXME_(win32)("(%04x, %04x, %08lx, %08lx): stub.\n", hFileHandle, hExistingCompletionPort, dwCompletionKey, dwNumberOfConcurrentThreads);
FIXME("(%04x, %04x, %08lx, %08lx): stub.\n", hFileHandle, hExistingCompletionPort, dwCompletionKey, dwNumberOfConcurrentThreads);
return (HANDLE)NULL;
}
......
windows/keyboard.c
View file @ dd03cc19
......@@ -25,8 +25,8 @@
#include "struct32.h"
#include "winerror.h"
DEFAULT_DEBUG_CHANNEL(keyboard)
DECLARE_DEBUG_CHANNEL(event)
DECLARE_DEBUG_CHANNEL(keyboard)
/**********************************************************************/
......@@ -137,7 +137,7 @@ void KEYBOARD_SendEvent( BYTE bVk, BYTE bScan, DWORD dwFlags,
*/
WORD WINAPI SetSpeed16(WORD unused)
{
FIXME_(keyboard)("(%04x): stub\n",unused);
FIXME("(%04x): stub\n", unused);
return 0xffff;
}
......@@ -146,7 +146,7 @@ WORD WINAPI SetSpeed16(WORD unused)
*/
VOID WINAPI ScreenSwitchEnable16(WORD unused)
{
FIXME_(keyboard)("(%04x): stub\n",unused);
FIXME("(%04x): stub\n", unused);
}
/**********************************************************************
......@@ -154,7 +154,7 @@ VOID WINAPI ScreenSwitchEnable16(WORD unused)
*/
DWORD WINAPI OemKeyScan(WORD wOemChar)
{
TRACE_(keyboard)("*OemKeyScan (%d)\n",wOemChar);
TRACE("*OemKeyScan (%d)\n", wOemChar);
return wOemChar;
}
......@@ -187,7 +187,7 @@ WORD WINAPI VkKeyScan16(CHAR cChar)
*/
INT16 WINAPI GetKeyboardType16(INT16 nTypeFlag)
{
TRACE_(keyboard)("(%d)\n",nTypeFlag);
TRACE("(%d)\n", nTypeFlag);
switch(nTypeFlag)
{
case 0: /* Keyboard type */
......@@ -200,7 +200,7 @@ INT16 WINAPI GetKeyboardType16(INT16 nTypeFlag)
return 12; /* We're doing an 101 for now, so return 12 F-keys */
break;
default:
WARN_(keyboard)("Unknown type\n");
WARN("Unknown type\n");
return 0; /* The book says 0 here, so 0 */
}
}
......@@ -220,7 +220,7 @@ UINT16 WINAPI MapVirtualKey16(UINT16 wCode, UINT16 wMapType)
*/
INT16 WINAPI GetKBCodePage16(void)
{
TRACE_(keyboard)("(void)\n");
TRACE("(void)\n");
return 850;
}
......
windows/message.c
View file @ dd03cc19
......@@ -29,8 +29,8 @@
#include "struct32.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(msg)
DECLARE_DEBUG_CHANNEL(key)
DECLARE_DEBUG_CHANNEL(msg)
DECLARE_DEBUG_CHANNEL(sendmsg)
#define WM_NCMOUSEFIRST WM_NCMOUSEMOVE
......@@ -1343,8 +1343,8 @@ BOOL16 WINAPI GetMessage16( SEGPTR msg, HWND16 hwnd, UINT16 first, UINT16 last)
STRUCT32_MSG32to16( &msg32, lpmsg );
TRACE_(msg)("message %04x, hwnd %04x, filter(%04x - %04x)\n", lpmsg->message,
hwnd, first, last );
TRACE("message %04x, hwnd %04x, filter(%04x - %04x)\n",
lpmsg->message, hwnd, first, last );
return ret;
}
......@@ -1389,7 +1389,7 @@ BOOL WINAPI GetMessageA(MSG* lpmsg,HWND hwnd,UINT min,UINT max)
{
MSG_PeekMessage( lpmsg, hwnd, min, max, PM_REMOVE, FALSE );
TRACE_(msg)("message %04x, hwnd %04x, filter(%04x - %04x)\n", lpmsg->message,
TRACE("message %04x, hwnd %04x, filter(%04x - %04x)\n", lpmsg->message,
hwnd, min, max );
HOOK_CallHooksA( WH_GETMESSAGE, HC_ACTION, 0, (LPARAM)lpmsg );
......@@ -1433,7 +1433,8 @@ BOOL WINAPI GetMessageW(
{
BOOL bRet = GetMessageA(lpmsg, hwnd, min, max);
if (bRet)
FIXME_(sendmsg)("(%s) unicode<->ascii\n", SPY_GetMsgName(lpmsg->message));
FIXME_(sendmsg)("(%s) unicode<->ascii\n",
SPY_GetMsgName(lpmsg->message));
return bRet;
}
......@@ -1470,19 +1471,19 @@ BOOL WINAPI PostMessageA( HWND hwnd, UINT message, WPARAM wParam,
if (hwnd == HWND_BROADCAST)
{
WND *pDesktop = WIN_GetDesktop();
TRACE_(msg)("HWND_BROADCAST !\n");
TRACE("HWND_BROADCAST !\n");
for (wndPtr=WIN_LockWndPtr(pDesktop->child); wndPtr; WIN_UpdateWndPtr(&wndPtr,wndPtr->next))
{
if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
{
TRACE_(msg)("BROADCAST Message to hWnd=%04x m=%04X w=%04X l=%08lX !\n",
wndPtr->hwndSelf, message, wParam, lParam);
TRACE("BROADCAST Message to hWnd=%04x m=%04X w=%04X l=%08lX !\n",
wndPtr->hwndSelf, message, wParam, lParam);
PostMessageA( wndPtr->hwndSelf, message, wParam, lParam );
}
}
WIN_ReleaseDesktop();
TRACE_(msg)("End of HWND_BROADCAST !\n");
TRACE("End of HWND_BROADCAST !\n");
return TRUE;
}
......@@ -1580,22 +1581,22 @@ static LRESULT MSG_SendMessage( HWND hwnd, UINT msg, WPARAM wParam,
}
WIN_ReleaseDesktop();
TRACE_(msg)("HWND_BROADCAST !\n");
TRACE("HWND_BROADCAST !\n");
for (ppWnd = list; *ppWnd; ppWnd++)
{
WIN_UpdateWndPtr(&wndPtr,*ppWnd);
if (!IsWindow(wndPtr->hwndSelf)) continue;
if (wndPtr->dwStyle & WS_POPUP || wndPtr->dwStyle & WS_CAPTION)
{
TRACE_(msg)("BROADCAST Message to hWnd=%04x m=%04X w=%04lX l=%08lX !\n",
wndPtr->hwndSelf, msg, (DWORD)wParam, lParam);
TRACE("BROADCAST Message to hWnd=%04x m=%04X w=%04lX l=%08lX !\n",
wndPtr->hwndSelf, msg, (DWORD)wParam, lParam);
MSG_SendMessage( wndPtr->hwndSelf, msg, wParam, lParam,
timeout, flags, pRes);
}
}
WIN_ReleaseWndPtr(wndPtr);
WIN_ReleaseWinArray(list);
TRACE_(msg)("End of HWND_BROADCAST !\n");
TRACE("End of HWND_BROADCAST !\n");
return 1;
}
......@@ -1628,7 +1629,7 @@ static LRESULT MSG_SendMessage( HWND hwnd, UINT msg, WPARAM wParam,
if (!(wndPtr = WIN_FindWndPtr( hwnd )))
{
WARN_(msg)("invalid hwnd %04x\n", hwnd );
WARN("invalid hwnd %04x\n", hwnd );
return 0;
}
if (QUEUE_IsExitingQueue(wndPtr->hmemTaskQ))
......@@ -2082,7 +2083,7 @@ static BOOL MSG_DoTranslateMessage( UINT message, HWND hwnd,
BYTE wp[2];
if (message != WM_MOUSEMOVE && message != WM_TIMER)
TRACE_(msg)("(%s, %04X, %08lX)\n",
TRACE("(%s, %04X, %08lX)\n",
SPY_GetMsgName(message), wParam, lParam );
if(message >= WM_KEYFIRST && message <= WM_KEYLAST)
TRACE_(key)("(%s, %04X, %08lX)\n",
......@@ -2214,7 +2215,7 @@ LONG WINAPI DispatchMessage16( const MSG16* msg )
if (painting && wndPtr &&
(wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
{
ERR_(msg)("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
ERR("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
msg->hwnd);
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
/* Validate the update region to avoid infinite WM_PAINT loop */
......@@ -2292,7 +2293,7 @@ LONG WINAPI DispatchMessageA( const MSG* msg )
if (painting && wndPtr &&
(wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
{
ERR_(msg)("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
ERR("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
msg->hwnd);
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
/* Validate the update region to avoid infinite WM_PAINT loop */
......@@ -2366,7 +2367,7 @@ LONG WINAPI DispatchMessageW( const MSG* msg )
if (painting && wndPtr &&
(wndPtr->flags & WIN_NEEDS_BEGINPAINT) && wndPtr->hrgnUpdate)
{
ERR_(msg)("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
ERR("BeginPaint not called on WM_PAINT for hwnd %04x!\n",
msg->hwnd);
wndPtr->flags &= ~WIN_NEEDS_BEGINPAINT;
/* Validate the update region to avoid infinite WM_PAINT loop */
......@@ -2383,7 +2384,7 @@ END:
*/
WORD WINAPI RegisterWindowMessage16( SEGPTR str )
{
TRACE_(msg)("%08lx\n", (DWORD)str );
TRACE("%08lx\n", (DWORD)str );
return GlobalAddAtom16( str );
}
......@@ -2393,7 +2394,7 @@ WORD WINAPI RegisterWindowMessage16( SEGPTR str )
*/
WORD WINAPI RegisterWindowMessageA( LPCSTR str )
{
TRACE_(msg)("%s\n", str );
TRACE("%s\n", str );
return GlobalAddAtomA( str );
}
......@@ -2403,7 +2404,7 @@ WORD WINAPI RegisterWindowMessageA( LPCSTR str )
*/
WORD WINAPI RegisterWindowMessageW( LPCWSTR str )
{
TRACE_(msg)("%p\n", str );
TRACE("%p\n", str );
return GlobalAddAtomW( str );
}
......@@ -2484,7 +2485,7 @@ LONG WINAPI BroadcastSystemMessage(
*/
BOOL WINAPI SendNotifyMessageA(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
{ BOOL ret = TRUE;
FIXME_(msg)("(%04x,%08x,%08x,%08lx) not complete\n",
FIXME("(%04x,%08x,%08x,%08lx) not complete\n",
hwnd, msg, wParam, lParam);
if ( GetCurrentThreadId() == GetWindowThreadProcessId ( hwnd, NULL))
......@@ -2505,7 +2506,7 @@ BOOL WINAPI SendNotifyMessageA(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
*/
BOOL WINAPI SendNotifyMessageW(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
{ BOOL ret = TRUE;
FIXME_(msg)("(%04x,%08x,%08x,%08lx) not complete\n",
FIXME("(%04x,%08x,%08x,%08lx) not complete\n",
hwnd, msg, wParam, lParam);
if ( GetCurrentThreadId() == GetWindowThreadProcessId ( hwnd, NULL))
......@@ -2527,11 +2528,11 @@ BOOL WINAPI SendMessageCallbackA(
HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam,
FARPROC lpResultCallBack,DWORD dwData)
{
FIXME_(msg)("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
FIXME("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
if ( hWnd == HWND_BROADCAST)
{ PostMessageA( hWnd, Msg, wParam, lParam);
FIXME_(msg)("Broadcast: Callback will not be called!\n");
FIXME("Broadcast: Callback will not be called!\n");
return TRUE;
}
(lpResultCallBack)( hWnd, Msg, dwData, SendMessageA ( hWnd, Msg, wParam, lParam ));
......@@ -2547,11 +2548,11 @@ BOOL WINAPI SendMessageCallbackW(
HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam,
FARPROC lpResultCallBack,DWORD dwData)
{
FIXME_(msg)("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
FIXME("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
if ( hWnd == HWND_BROADCAST)
{ PostMessageW( hWnd, Msg, wParam, lParam);
FIXME_(msg)("Broadcast: Callback will not be called!\n");
FIXME("Broadcast: Callback will not be called!\n");
return TRUE;
}
(lpResultCallBack)( hWnd, Msg, dwData, SendMessageA ( hWnd, Msg, wParam, lParam ));
......
windows/nonclient.c
View file @ dd03cc19
......@@ -28,7 +28,7 @@
#include "cache.h"
#include "bitmap.h"
DECLARE_DEBUG_CHANNEL(nonclient)
DEFAULT_DEBUG_CHANNEL(nonclient)
DECLARE_DEBUG_CHANNEL(shell)
BOOL NC_DrawGrayButton(HDC hdc, int x, int y);
......@@ -115,7 +115,7 @@ static void NC_AdjustRect( LPRECT16 rect, DWORD style, BOOL menu,
DWORD exStyle )
{
if (TWEAK_WineLook > WIN31_LOOK)
ERR_(nonclient)("Called in Win95 mode. Aiee! Please report this.\n" );
ERR("Called in Win95 mode. Aiee! Please report this.\n" );
if(style & WS_ICONIC) return;
/* Decide if the window will be managed (see CreateWindowEx) */
......@@ -340,8 +340,8 @@ DrawCaptionTempA (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
{
RECT rc = *rect;
TRACE_(nonclient)("(%08x,%08x,%p,%08x,%08x,\"%s\",%08x)\n",
hwnd, hdc, rect, hFont, hIcon, str, uFlags);
TRACE("(%08x,%08x,%p,%08x,%08x,\"%s\",%08x)\n",
hwnd, hdc, rect, hFont, hIcon, str, uFlags);
/* drawing background */
if (uFlags & DC_INBUTTON) {
......@@ -426,7 +426,7 @@ DrawCaptionTempA (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
/* drawing focus ??? */
if (uFlags & 0x2000)
FIXME_(nonclient)("undocumented flag (0x2000)!\n");
FIXME("undocumented flag (0x2000)!\n");
return 0;
}
......@@ -486,9 +486,9 @@ BOOL16 WINAPI AdjustWindowRectEx16( LPRECT16 rect, DWORD style,
WS_EX_STATICEDGE | WS_EX_TOOLWINDOW);
if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME;
TRACE_(nonclient)("(%d,%d)-(%d,%d) %08lx %d %08lx\n",
rect->left, rect->top, rect->right, rect->bottom,
style, menu, exStyle );
TRACE("(%d,%d)-(%d,%d) %08lx %d %08lx\n",
rect->left, rect->top, rect->right, rect->bottom,
style, menu, exStyle );
if (TWEAK_WineLook == WIN31_LOOK)
NC_AdjustRect( rect, style, menu, exStyle );
......@@ -543,11 +543,10 @@ LONG NC_HandleNCCalcSize( WND *pWnd, RECT *winRect )
winRect->bottom -= tmpRect.bottom;
if (HAS_MENU(pWnd)) {
TRACE_(nonclient)("Calling "
"GetMenuBarHeight with HWND 0x%x, width %d, "
"at (%d, %d).\n", pWnd->hwndSelf,
winRect->right - winRect->left,
-tmpRect.left, -tmpRect.top );
TRACE("Calling GetMenuBarHeight with HWND 0x%x, width %d, "
"at (%d, %d).\n", pWnd->hwndSelf,
winRect->right - winRect->left,
-tmpRect.left, -tmpRect.top );
winRect->top +=
MENU_GetMenuBarHeight( pWnd->hwndSelf,
......@@ -665,8 +664,7 @@ static LONG NC_DoNCHitTest (WND *wndPtr, POINT16 pt )
{
RECT16 rect;
TRACE_(nonclient)("hwnd=%04x pt=%d,%d\n",
wndPtr->hwndSelf, pt.x, pt.y );
TRACE("hwnd=%04x pt=%d,%d\n", wndPtr->hwndSelf, pt.x, pt.y );
GetWindowRect16 (wndPtr->hwndSelf, &rect );
if (!PtInRect16( &rect, pt )) return HTNOWHERE;
......@@ -801,8 +799,7 @@ NC_DoNCHitTest95 (WND *wndPtr, POINT16 pt )
{
RECT16 rect;
TRACE_(nonclient)("hwnd=%04x pt=%d,%d\n",
wndPtr->hwndSelf, pt.x, pt.y );
TRACE("hwnd=%04x pt=%d,%d\n", wndPtr->hwndSelf, pt.x, pt.y );
GetWindowRect16 (wndPtr->hwndSelf, &rect );
if (!PtInRect16( &rect, pt )) return HTNOWHERE;
......@@ -1280,7 +1277,7 @@ static void NC_DrawFrame( HDC hdc, RECT *rect, BOOL dlgFrame,
INT width, height;
if (TWEAK_WineLook != WIN31_LOOK)
ERR_(nonclient)("Called in Win95 mode. Aiee! Please report this.\n" );
ERR("Called in Win95 mode. Aiee! Please report this.\n" );
if (dlgFrame)
{
......@@ -1651,7 +1648,7 @@ static void NC_DoNCPaint( WND* wndPtr, HRGN clip, BOOL suppress_menupaint )
active = wndPtr->flags & WIN_NCACTIVATED;
TRACE_(nonclient)("%04x %d\n", hwnd, active );
TRACE("%04x %d\n", hwnd, active );
if (!(hdc = GetDCEx( hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
((clip > 1) ? (DCX_INTERSECTRGN | DCX_KEEPCLIPRGN): 0) ))) return;
......@@ -1766,12 +1763,13 @@ static void NC_DoNCPaint95(
active = wndPtr->flags & WIN_NCACTIVATED;
TRACE_(nonclient)("%04x %d\n", hwnd, active );
TRACE("%04x %d\n", hwnd, active );
/* MSDN docs are pretty idiotic here, they say app CAN use clipRgn in the call to
* GetDCEx implying that it is allowed not to use it either. However, the suggested
* GetDCEx( , DCX_WINDOW | DCX_INTERSECTRGN) will cause clipRgn to be deleted
* after ReleaseDC(). Now, how is the "system" supposed to tell what happened?
/* MSDN docs are pretty idiotic here, they say app CAN use clipRgn in
the call to GetDCEx implying that it is allowed not to use it either.
However, the suggested GetDCEx( , DCX_WINDOW | DCX_INTERSECTRGN)
will cause clipRgn to be deleted after ReleaseDC().
Now, how is the "system" supposed to tell what happened?
*/
if (!(hdc = GetDCEx( hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
......@@ -1837,15 +1835,14 @@ static void NC_DoNCPaint95(
RECT r = rect;
r.bottom = rect.top + GetSystemMetrics(SM_CYMENU);
TRACE_(nonclient)("Calling DrawMenuBar with "
"rect (%d, %d)-(%d, %d)\n", r.left, r.top,
r.right, r.bottom);
TRACE("Calling DrawMenuBar with rect (%d, %d)-(%d, %d)\n",
r.left, r.top, r.right, r.bottom);
rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1;
}
TRACE_(nonclient)("After MenuBar, rect is (%d, %d)-(%d, %d).\n",
rect.left, rect.top, rect.right, rect.bottom );
TRACE("After MenuBar, rect is (%d, %d)-(%d, %d).\n",
rect.left, rect.top, rect.right, rect.bottom );
if (wndPtr->dwExStyle & WS_EX_CLIENTEDGE)
DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
......@@ -2715,8 +2712,7 @@ LONG NC_HandleSysCommand( HWND hwnd, WPARAM16 wParam, POINT16 pt )
POINT pt32;
UINT16 uCommand = wParam & 0xFFF0;
TRACE_(nonclient)("Handling WM_SYSCOMMAND %x %d,%d\n",
wParam, pt.x, pt.y );
TRACE("Handling WM_SYSCOMMAND %x %d,%d\n", wParam, pt.x, pt.y );
if (wndPtr->dwStyle & WS_CHILD && uCommand != SC_KEYMENU )
ScreenToClient16( wndPtr->parent->hwndSelf, &pt );
......@@ -2781,7 +2777,7 @@ LONG NC_HandleSysCommand( HWND hwnd, WPARAM16 wParam, POINT16 pt )
case SC_ARRANGE:
case SC_NEXTWINDOW:
case SC_PREVWINDOW:
FIXME_(nonclient)("unimplemented!\n");
FIXME("unimplemented!\n");
break;
}
WIN_ReleaseWndPtr(wndPtr);
......
windows/painting.c
View file @ dd03cc19
......@@ -14,8 +14,8 @@
#include "wine/winuser16.h"
#include "cache.h"
DEFAULT_DEBUG_CHANNEL(win)
DECLARE_DEBUG_CHANNEL(nonclient)
DECLARE_DEBUG_CHANNEL(win)
/* client rect in window coordinates */
......@@ -294,7 +294,7 @@ HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps )
HideCaret( hwnd );
TRACE_(win)("hrgnUpdate = %04x, \n", hrgnUpdate);
TRACE("hrgnUpdate = %04x, \n", hrgnUpdate);
if (GetClassWord16(wndPtr->hwndSelf, GCW_STYLE) & CS_PARENTDC)
{
......@@ -314,11 +314,11 @@ HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps )
/* ReleaseDC() in EndPaint() will delete the region */
}
TRACE_(win)("hdc = %04x\n", lps->hdc);
TRACE("hdc = %04x\n", lps->hdc);
if (!lps->hdc)
{
WARN_(win)("GetDCEx() failed in BeginPaint(), hwnd=%04x\n", hwnd);
WARN("GetDCEx() failed in BeginPaint(), hwnd=%04x\n", hwnd);
WIN_ReleaseWndPtr(wndPtr);
return 0;
}
......@@ -336,7 +336,7 @@ HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps )
IntersectRect16(&lps->rcPaint, &clientRect, &clipRect);
TRACE_(win)("box = (%i,%i - %i,%i)\n", lps->rcPaint.left, lps->rcPaint.top,
TRACE("box = (%i,%i - %i,%i)\n", lps->rcPaint.left, lps->rcPaint.top,
lps->rcPaint.right, lps->rcPaint.bottom );
if (wndPtr->flags & WIN_NEEDS_ERASEBKGND)
......@@ -546,7 +546,7 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
r.right = wndPtr->rectWindow.right - wndPtr->rectWindow.left;
r.bottom = wndPtr->rectWindow.bottom - wndPtr->rectWindow.top;
TRACE_(win)("\thwnd %04x [%04x] -> hrgn [%04x], flags [%04x]\n", wndPtr->hwndSelf, wndPtr->hrgnUpdate, hRgn, flags );
TRACE("\thwnd %04x [%04x] -> hrgn [%04x], flags [%04x]\n", wndPtr->hwndSelf, wndPtr->hrgnUpdate, hRgn, flags );
if( flags & RDW_INVALIDATE )
{
......@@ -735,7 +735,7 @@ static HRGN RDW_Paint( WND* wndPtr, HRGN hrgn, UINT flags, UINT ex )
/* Erase/update the window itself ... */
TRACE_(win)("\thwnd %04x [%04x] -> hrgn [%04x], flags [%04x]\n", hWnd, wndPtr->hrgnUpdate, hrgn, flags );
TRACE("\thwnd %04x [%04x] -> hrgn [%04x], flags [%04x]\n", hWnd, wndPtr->hrgnUpdate, hrgn, flags );
/*
* Check if this window should delay it's processing of WM_NCPAINT.
......@@ -840,7 +840,7 @@ BOOL PAINT_RedrawWindow( HWND hwnd, const RECT *rectUpdate,
if( hrgnUpdate )
{
GetRgnBox( hrgnUpdate, &r );
TRACE_(win)( "%04x (%04x) NULL %04x box (%i,%i-%i,%i) flags=%04x, exflags=%04x\n",
TRACE( "%04x (%04x) NULL %04x box (%i,%i-%i,%i) flags=%04x, exflags=%04x\n",
hwnd, wndPtr->hrgnUpdate, hrgnUpdate, r.left, r.top, r.right, r.bottom, flags, ex);
}
else
......@@ -849,7 +849,7 @@ BOOL PAINT_RedrawWindow( HWND hwnd, const RECT *rectUpdate,
r = *rectUpdate;
else
SetRectEmpty( &r );
TRACE_(win)( "%04x (%04x) %s %d,%d-%d,%d %04x flags=%04x, exflags=%04x\n",
TRACE( "%04x (%04x) %s %d,%d-%d,%d %04x flags=%04x, exflags=%04x\n",
hwnd, wndPtr->hrgnUpdate, rectUpdate ? "rect" : "NULL", r.left,
r.top, r.right, r.bottom, hrgnUpdate, flags, ex );
}
......
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