Cleaned up debug channels a bit.
This commit is contained in:
parent
87a2cc134e
commit
014dccc71e
|
@ -12,8 +12,7 @@
|
||||||
#include "debugtools.h"
|
#include "debugtools.h"
|
||||||
#include "winversion.h"
|
#include "winversion.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(advapi)
|
DEFAULT_DEBUG_CHANNEL(advapi);
|
||||||
DECLARE_DEBUG_CHANNEL(security)
|
|
||||||
|
|
||||||
#define CallWin32ToNt(func) \
|
#define CallWin32ToNt(func) \
|
||||||
{ NTSTATUS ret; \
|
{ NTSTATUS ret; \
|
||||||
|
@ -572,7 +571,7 @@ LookupAccountSidA(
|
||||||
{
|
{
|
||||||
char * ac = "Administrator";
|
char * ac = "Administrator";
|
||||||
char * dm = "DOMAIN";
|
char * dm = "DOMAIN";
|
||||||
FIXME_(security)("(%s,sid=%p,%p,%p(%lu),%p,%p(%lu),%p): semi-stub\n",
|
FIXME("(%s,sid=%p,%p,%p(%lu),%p,%p(%lu),%p): semi-stub\n",
|
||||||
debugstr_a(system),sid,
|
debugstr_a(system),sid,
|
||||||
account,accountSize,accountSize?*accountSize:0,
|
account,accountSize,accountSize?*accountSize:0,
|
||||||
domain,domainSize,domainSize?*domainSize:0,
|
domain,domainSize,domainSize?*domainSize:0,
|
||||||
|
@ -614,7 +613,7 @@ LookupAccountSidW(
|
||||||
{
|
{
|
||||||
char * ac = "Administrator";
|
char * ac = "Administrator";
|
||||||
char * dm = "DOMAIN";
|
char * dm = "DOMAIN";
|
||||||
FIXME_(security)("(%s,sid=%p,%p,%p(%lu),%p,%p(%lu),%p): semi-stub\n",
|
FIXME("(%s,sid=%p,%p,%p(%lu),%p,%p(%lu),%p): semi-stub\n",
|
||||||
debugstr_w(system),sid,
|
debugstr_w(system),sid,
|
||||||
account,accountSize,accountSize?*accountSize:0,
|
account,accountSize,accountSize?*accountSize:0,
|
||||||
domain,domainSize,domainSize?*domainSize:0,
|
domain,domainSize,domainSize?*domainSize:0,
|
||||||
|
|
|
@ -13,9 +13,7 @@
|
||||||
#include "winerror.h"
|
#include "winerror.h"
|
||||||
#include "debugtools.h"
|
#include "debugtools.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(avifile)
|
DEFAULT_DEBUG_CHANNEL(avifile);
|
||||||
DECLARE_DEBUG_CHANNEL(msvideo)
|
|
||||||
DECLARE_DEBUG_CHANNEL(relay)
|
|
||||||
|
|
||||||
static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj);
|
static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj);
|
||||||
static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile* iface);
|
static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile* iface);
|
||||||
|
@ -116,7 +114,7 @@ typedef struct IAVIFileImpl {
|
||||||
static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj) {
|
static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj) {
|
||||||
ICOM_THIS(IAVIFileImpl,iface);
|
ICOM_THIS(IAVIFileImpl,iface);
|
||||||
|
|
||||||
TRACE_(relay)("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
|
TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
|
||||||
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
|
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
|
||||||
!memcmp(&IID_IAVIFile,refiid,sizeof(IID_IAVIFile))
|
!memcmp(&IID_IAVIFile,refiid,sizeof(IID_IAVIFile))
|
||||||
) {
|
) {
|
||||||
|
@ -129,14 +127,14 @@ static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LP
|
||||||
static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile* iface) {
|
static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile* iface) {
|
||||||
ICOM_THIS(IAVIFileImpl,iface);
|
ICOM_THIS(IAVIFileImpl,iface);
|
||||||
|
|
||||||
FIXME_(relay)("(%p)->AddRef()\n",iface);
|
FIXME("(%p)->AddRef()\n",iface);
|
||||||
return ++(This->ref);
|
return ++(This->ref);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG WINAPI IAVIFile_fnRelease(IAVIFile* iface) {
|
static ULONG WINAPI IAVIFile_fnRelease(IAVIFile* iface) {
|
||||||
ICOM_THIS(IAVIFileImpl,iface);
|
ICOM_THIS(IAVIFileImpl,iface);
|
||||||
|
|
||||||
FIXME_(relay)("(%p)->Release()\n",iface);
|
FIXME("(%p)->Release()\n",iface);
|
||||||
if (!--(This->ref)) {
|
if (!--(This->ref)) {
|
||||||
HeapFree(GetProcessHeap(),0,iface);
|
HeapFree(GetProcessHeap(),0,iface);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -220,7 +218,7 @@ HRESULT WINAPI AVIFileOpenA(
|
||||||
static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj) {
|
static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj) {
|
||||||
ICOM_THIS(IAVIStreamImpl,iface);
|
ICOM_THIS(IAVIStreamImpl,iface);
|
||||||
|
|
||||||
TRACE_(relay)("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
|
TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
|
||||||
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
|
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
|
||||||
!memcmp(&IID_IAVIStream,refiid,sizeof(IID_IAVIStream))
|
!memcmp(&IID_IAVIStream,refiid,sizeof(IID_IAVIStream))
|
||||||
) {
|
) {
|
||||||
|
@ -234,14 +232,14 @@ static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid
|
||||||
static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface) {
|
static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface) {
|
||||||
ICOM_THIS(IAVIStreamImpl,iface);
|
ICOM_THIS(IAVIStreamImpl,iface);
|
||||||
|
|
||||||
FIXME_(relay)("(%p)->AddRef()\n",iface);
|
FIXME("(%p)->AddRef()\n",iface);
|
||||||
return ++(This->ref);
|
return ++(This->ref);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) {
|
static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) {
|
||||||
ICOM_THIS(IAVIStreamImpl,iface);
|
ICOM_THIS(IAVIStreamImpl,iface);
|
||||||
|
|
||||||
FIXME_(relay)("(%p)->Release()\n",iface);
|
FIXME("(%p)->Release()\n",iface);
|
||||||
if (!--(This->ref)) {
|
if (!--(This->ref)) {
|
||||||
HeapFree(GetProcessHeap(),0,This);
|
HeapFree(GetProcessHeap(),0,This);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -500,7 +498,7 @@ ULONG WINAPI AVIStreamRelease(PAVISTREAM iface) {
|
||||||
}
|
}
|
||||||
|
|
||||||
PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM iface,LPBITMAPINFOHEADER bmi) {
|
PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM iface,LPBITMAPINFOHEADER bmi) {
|
||||||
FIXME_(msvideo)("(%p)->(%p),stub!\n",iface,bmi);
|
FIXME("(%p)->(%p),stub!\n",iface,bmi);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,6 @@ char dbch_region[] = "\003region";
|
||||||
char dbch_relay[] = "\003relay";
|
char dbch_relay[] = "\003relay";
|
||||||
char dbch_resource[] = "\003resource";
|
char dbch_resource[] = "\003resource";
|
||||||
char dbch_scroll[] = "\003scroll";
|
char dbch_scroll[] = "\003scroll";
|
||||||
char dbch_security[] = "\003security";
|
|
||||||
char dbch_segment[] = "\003segment";
|
char dbch_segment[] = "\003segment";
|
||||||
char dbch_seh[] = "\003seh";
|
char dbch_seh[] = "\003seh";
|
||||||
char dbch_selector[] = "\003selector";
|
char dbch_selector[] = "\003selector";
|
||||||
|
@ -171,7 +170,7 @@ char dbch_wnet[] = "\003wnet";
|
||||||
char dbch_x11[] = "\003x11";
|
char dbch_x11[] = "\003x11";
|
||||||
char dbch_x11drv[] = "\003x11drv";
|
char dbch_x11drv[] = "\003x11drv";
|
||||||
|
|
||||||
#define DEBUG_CHANNEL_COUNT 164
|
#define DEBUG_CHANNEL_COUNT 163
|
||||||
|
|
||||||
static char * const debug_channels[DEBUG_CHANNEL_COUNT] = {
|
static char * const debug_channels[DEBUG_CHANNEL_COUNT] = {
|
||||||
dbch_accel,
|
dbch_accel,
|
||||||
|
@ -290,7 +289,6 @@ static char * const debug_channels[DEBUG_CHANNEL_COUNT] = {
|
||||||
dbch_relay,
|
dbch_relay,
|
||||||
dbch_resource,
|
dbch_resource,
|
||||||
dbch_scroll,
|
dbch_scroll,
|
||||||
dbch_security,
|
|
||||||
dbch_segment,
|
dbch_segment,
|
||||||
dbch_seh,
|
dbch_seh,
|
||||||
dbch_selector,
|
dbch_selector,
|
||||||
|
|
Loading…
Reference in New Issue