Skip to content

W
wine-winehq
Commit 359f497e authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Converted to the new debug interface, using script written by Patrik

Stridvall.
parent 2d0bb2a7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 578 additions and 580 deletions
files/async.c
View file @ 359f497e
......@@ -40,7 +40,7 @@
#include "selectors.h"
#include "sig_context.h"
#include "async.h"
#include "debug.h"
#include "debugtools.h"
typedef struct _async_fd {
int unixfd;
......
files/change.c
View file @ 359f497e
......@@ -15,7 +15,7 @@
#include "thread.h"
#include "heap.h"
#include "server.h"
#include "debug.h"
#include "debugtools.h"
/****************************************************************************
......
files/profile.c
View file @ 359f497e
......@@ -17,7 +17,7 @@
#include "winnls.h"
#include "file.h"
#include "heap.h"
#include "debug.h"
#include "debugtools.h"
#include "options.h"
DEFAULT_DEBUG_CHANNEL(profile)
......@@ -208,7 +208,7 @@ static PROFILESECTION *PROFILE_Load( FILE *file )
{
if (!(p2 = strrchr( p, ']' )))
{
WARN(profile, "Invalid section header at line %d: '%s'\n",
WARN("Invalid section header at line %d: '%s'\n",
line, p );
}
else
......@@ -224,7 +224,7 @@ static PROFILESECTION *PROFILE_Load( FILE *file )
next_key = &section->key;
prev_key = NULL;
TRACE(profile, "New section: '%s'\n",section->name);
TRACE("New section: '%s'\n",section->name);
continue;
}
......@@ -251,7 +251,7 @@ static PROFILESECTION *PROFILE_Load( FILE *file )
next_key = &key->next;
prev_key = key;
TRACE(profile, "New key: name='%s', value='%s'\n",key->name,key->value?key->value:"(none)");
TRACE("New key: name='%s', value='%s'\n",key->name,key->value?key->value:"(none)");
}
}
return first_section;
......@@ -368,7 +368,7 @@ static BOOL PROFILE_FlushFile(void)
if(!CurProfile)
{
WARN(profile, "No current profile!\n");
WARN("No current profile!\n");
return FALSE;
}
......@@ -391,11 +391,11 @@ static BOOL PROFILE_FlushFile(void)
if (!file)
{
WARN(profile, "could not save profile file %s\n", CurProfile->dos_name);
WARN("could not save profile file %s\n", CurProfile->dos_name);
return FALSE;
}
TRACE(profile, "Saving '%s' into '%s'\n", CurProfile->dos_name, unix_name );
TRACE("Saving '%s' into '%s'\n", CurProfile->dos_name, unix_name );
PROFILE_Save( file, CurProfile->section );
fclose( file );
CurProfile->changed = FALSE;
......@@ -463,10 +463,10 @@ static BOOL PROFILE_Open( LPCSTR filename )
CurProfile=tempProfile;
}
if(!stat(CurProfile->unix_name,&buf) && CurProfile->mtime==buf.st_mtime)
TRACE(profile, "(%s): already opened (mru=%d)\n",
TRACE("(%s): already opened (mru=%d)\n",
filename, i );
else
TRACE(profile, "(%s): already opened, needs refreshing (mru=%d)\n",
TRACE("(%s): already opened, needs refreshing (mru=%d)\n",
filename, i );
return TRUE;
}
......@@ -515,7 +515,7 @@ static BOOL PROFILE_Open( LPCSTR filename )
CharLowerA( p );
if ((file = fopen( buffer, "r" )))
{
TRACE(profile, "(%s): found it in %s\n",
TRACE("(%s): found it in %s\n",
filename, buffer );
CurProfile->unix_name = HEAP_strdupA( SystemHeap, 0, buffer );
}
......@@ -526,7 +526,7 @@ static BOOL PROFILE_Open( LPCSTR filename )
CurProfile->unix_name = HEAP_strdupA( SystemHeap, 0,
full_name.long_name );
if ((file = fopen( full_name.long_name, "r" )))
TRACE(profile, "(%s): found it in %s\n",
TRACE("(%s): found it in %s\n",
filename, full_name.long_name );
}
......@@ -540,7 +540,7 @@ static BOOL PROFILE_Open( LPCSTR filename )
else
{
/* Does not exist yet, we will create it in PROFILE_FlushFile */
WARN(profile, "profile file %s not found\n", newdos_name );
WARN("profile file %s not found\n", newdos_name );
}
return TRUE;
}
......@@ -637,7 +637,7 @@ static INT PROFILE_GetString( LPCSTR section, LPCSTR key_name,
key = PROFILE_Find( &CurProfile->section, section, key_name, FALSE );
PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val,
len, FALSE );
TRACE(profile, "('%s','%s','%s'): returning '%s'\n",
TRACE("('%s','%s','%s'): returning '%s'\n",
section, key_name, def_val, buffer );
return strlen( buffer );
}
......@@ -659,7 +659,7 @@ static BOOL PROFILE_SetString( LPCSTR section_name, LPCSTR key_name,
{
if (!key_name) /* Delete a whole section */
{
TRACE(profile, "('%s')\n", section_name);
TRACE("('%s')\n", section_name);
CurProfile->changed |= PROFILE_DeleteSection( &CurProfile->section,
section_name );
return TRUE; /* Even if PROFILE_DeleteSection() has failed,
......@@ -667,7 +667,7 @@ static BOOL PROFILE_SetString( LPCSTR section_name, LPCSTR key_name,
}
else if (!value) /* Delete a key */
{
TRACE(profile, "('%s','%s')\n",
TRACE("('%s','%s')\n",
section_name, key_name );
CurProfile->changed |= PROFILE_DeleteKey( &CurProfile->section,
section_name, key_name );
......@@ -677,20 +677,20 @@ static BOOL PROFILE_SetString( LPCSTR section_name, LPCSTR key_name,
{
PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section_name,
key_name, TRUE );
TRACE(profile, "('%s','%s','%s'): \n",
TRACE("('%s','%s','%s'): \n",
section_name, key_name, value );
if (!key) return FALSE;
if (key->value)
{
if (!strcmp( key->value, value ))
{
TRACE(profile, " no change needed\n" );
TRACE(" no change needed\n" );
return TRUE; /* No change needed */
}
TRACE(profile, " replacing '%s'\n", key->value );
TRACE(" replacing '%s'\n", key->value );
HeapFree( SystemHeap, 0, key->value );
}
else TRACE(profile, " creating key\n" );
else TRACE(" creating key\n" );
key->value = HEAP_strdupA( SystemHeap, 0, value );
CurProfile->changed = TRUE;
}
......@@ -715,7 +715,7 @@ int PROFILE_GetWineIniString( const char *section, const char *key_name,
PROFILEKEY *key = PROFILE_Find(&PROFILE_WineProfile, section, key_name, FALSE);
PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def,
len, TRUE );
TRACE(profile, "('%s','%s','%s'): returning '%s'\n",
TRACE("('%s','%s','%s'): returning '%s'\n",
section, key_name, def, buffer );
ret = strlen( buffer );
}
......@@ -865,7 +865,7 @@ int PROFILE_GetWineIniBool(
retval = def;
}
TRACE(profile, "(\"%s\", \"%s\", %s), "
TRACE("(\"%s\", \"%s\", %s), "
"[%c], ret %s.\n", section, key_name,
def ? "TRUE" : "FALSE", key_value[0],
retval ? "TRUE" : "FALSE");
......@@ -916,7 +916,7 @@ int PROFILE_LoadWineIni(void)
return 1;
}
}
else WARN(profile, "could not get $HOME value for config file.\n" );
else WARN("could not get $HOME value for config file.\n" );
/* Try global file */
......@@ -927,7 +927,7 @@ int PROFILE_LoadWineIni(void)
strncpy(PROFILE_WineIniUsed,WINE_INI_GLOBAL,MAX_PATHNAME_LEN-1);
return 1;
}
MSG( "Can't open configuration file %s or $HOME%s\n",
MESSAGE( "Can't open configuration file %s or $HOME%s\n",
WINE_INI_GLOBAL, PROFILE_WineIniName );
return 0;
}
......@@ -942,13 +942,13 @@ int PROFILE_LoadWineIni(void)
*/
void PROFILE_UsageWineIni(void)
{
MSG("Perhaps you have not properly edited or created "
MESSAGE("Perhaps you have not properly edited or created "
"your Wine configuration file.\n");
MSG("This is either %s or $HOME%s\n",WINE_INI_GLOBAL,PROFILE_WineIniName);
MSG(" or it is determined by the -config option or from\n"
MESSAGE("This is either %s or $HOME%s\n",WINE_INI_GLOBAL,PROFILE_WineIniName);
MESSAGE(" or it is determined by the -config option or from\n"
" the WINE_INI environment variable.\n");
if (*PROFILE_WineIniUsed)
MSG("Wine has used %s as configuration file.\n", PROFILE_WineIniUsed);
MESSAGE("Wine has used %s as configuration file.\n", PROFILE_WineIniUsed);
/* RTFM, so to say */
}
......@@ -1314,11 +1314,11 @@ BOOL WINAPI WritePrivateProfileSectionA( LPCSTR section,
{
char *p =(char*)string;
FIXME(profile, "WritePrivateProfileSection32A empty stub\n");
FIXME("WritePrivateProfileSection32A empty stub\n");
if (TRACE_ON(profile)) {
TRACE(profile, "(%s) => [%s]\n", filename, section);
TRACE("(%s) => [%s]\n", filename, section);
while (*(p+1)) {
TRACE(profile, "%s\n", p);
TRACE("%s\n", p);
p += strlen(p);
p += 1;
}
......
include/debug.h deleted 100644 → 0
View file @ 2d0bb2a7
#define OLD_DEBUG_MACROS
#include "debugtools.h"
multimedia/joystick.c
View file @ 359f497e
......@@ -22,7 +22,7 @@
#include "winuser.h"
#include "winbase.h"
#include "mmsystem.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(mmsys)
......@@ -97,7 +97,7 @@ void joySendMessages(void)
}
if (joyCaptured == FALSE) return;
TRACE(mmsys, " --\n");
TRACE(" --\n");
for (joy=0; joy < MAXJOYDRIVERS; joy++) {
if (joyOpenDriver(joy) == FALSE) continue;
......@@ -146,8 +146,8 @@ UINT16 WINAPI joyGetNumDevs16(void)
joyCloseDriver(joy);
joy_cnt++;
}
TRACE(mmsys, "returning %d\n", joy_cnt);
if (!joy_cnt) ERR(mmsys, "No joystick found - "
TRACE("returning %d\n", joy_cnt);
if (!joy_cnt) ERR("No joystick found - "
"perhaps get joystick-0.8.0.tar.gz and load"
"it as module or use Linux >= 2.1.45 to be "
"able to use joysticks.\n");
......@@ -230,7 +230,7 @@ MMRESULT WINAPI joyGetDevCapsW(UINT wID, LPJOYCAPSW lpCaps,UINT wSize)
*/
MMRESULT16 WINAPI joyGetDevCaps16(UINT16 wID, LPJOYCAPS16 lpCaps, UINT16 wSize)
{
TRACE(mmsys, "(%04X, %p, %d);\n",
TRACE("(%04X, %p, %d);\n",
wID, lpCaps, wSize);
if (joyOpenDriver(wID) == TRUE) {
lpCaps->wMid = MM_MICROSOFT;
......@@ -298,7 +298,7 @@ MMRESULT16 WINAPI joyGetPos16(UINT16 wID, LPJOYINFO16 lpInfo)
{
struct js_status js;
TRACE(mmsys, "(%04X, %p)\n", wID, lpInfo);
TRACE("(%04X, %p)\n", wID, lpInfo);
if (joyOpenDriver(wID) == FALSE) return MMSYSERR_NODRIVER;
dev_stat = read(joy_dev[wID], &js, sizeof(js));
if (dev_stat != sizeof(js)) {
......@@ -312,7 +312,7 @@ MMRESULT16 WINAPI joyGetPos16(UINT16 wID, LPJOYINFO16 lpInfo)
lpInfo->wYpos = js.y;
lpInfo->wZpos = 0; /* FIXME: Don't know what to do with this value as joystick driver doesn't provide a Z value */
lpInfo->wButtons = js.buttons;
TRACE(mmsys, "x: %d, y: %d, buttons: %d\n", js.x, js.y, js.buttons);
TRACE("x: %d, y: %d, buttons: %d\n", js.x, js.y, js.buttons);
return JOYERR_NOERROR;
}
......@@ -333,7 +333,7 @@ MMRESULT WINAPI joyGetThreshold(UINT wID, LPUINT lpThreshold)
*/
MMRESULT16 WINAPI joyGetThreshold16(UINT16 wID, LPUINT16 lpThreshold)
{
TRACE(mmsys, "(%04X, %p);\n", wID, lpThreshold);
TRACE("(%04X, %p);\n", wID, lpThreshold);
if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
*lpThreshold = joy_threshold[wID];
return JOYERR_NOERROR;
......@@ -352,7 +352,7 @@ MMRESULT WINAPI joyReleaseCapture(UINT wID)
*/
MMRESULT16 WINAPI joyReleaseCapture16(UINT16 wID)
{
TRACE(mmsys, "(%04X);\n", wID);
TRACE("(%04X);\n", wID);
joyCaptured = FALSE;
joyCloseDriver(wID);
joy_dev[wID] = -1;
......@@ -374,7 +374,7 @@ MMRESULT WINAPI joySetCapture(HWND hWnd,UINT wID,UINT wPeriod,BOOL bChanged)
MMRESULT16 WINAPI joySetCapture16(HWND16 hWnd,UINT16 wID,UINT16 wPeriod,BOOL16 bChanged)
{
TRACE(mmsys, "(%04X, %04X, %d, %d);\n",
TRACE("(%04X, %04X, %d, %d);\n",
hWnd, wID, wPeriod, bChanged);
if (!CaptureWnd[wID]) {
......@@ -399,7 +399,7 @@ MMRESULT WINAPI joySetThreshold(UINT wID, UINT wThreshold)
*/
MMRESULT16 WINAPI joySetThreshold16(UINT16 wID, UINT16 wThreshold)
{
TRACE(mmsys, "(%04X, %d);\n", wID, wThreshold);
TRACE("(%04X, %d);\n", wID, wThreshold);
if (wID > 3) return JOYERR_PARMS;
joy_threshold[wID] = wThreshold;
......@@ -411,6 +411,6 @@ MMRESULT16 WINAPI joySetThreshold16(UINT16 wID, UINT16 wThreshold)
*/
MMRESULT16 WINAPI joySetCalibration16(UINT16 wID)
{
FIXME(mmsys, "(%04X): stub.\n", wID);
FIXME("(%04X): stub.\n", wID);
return JOYERR_NOCANDO;
}
multimedia/mcistring.c
View file @ 359f497e
......@@ -27,7 +27,7 @@
#include "user.h"
#include "driver.h"
#include "callback.h"
#include "debug.h"
#include "debugtools.h"
#include "xmalloc.h"
DEFAULT_DEBUG_CHANNEL(mci)
......@@ -50,10 +50,10 @@ DEFAULT_DEBUG_CHANNEL(mci)
*/
#define _MCI_STR(s) \
do { \
TRACE(mci, "-> returns '%s'\n", s); \
TRACE("-> returns '%s'\n", s); \
if (lpstrReturnString) { \
lstrcpynA(lpstrReturnString, s, uReturnLength); \
TRACE(mci, "--> '%s'\n", lpstrReturnString); \
TRACE("--> '%s'\n", lpstrReturnString); \
} \
} while(0)
......@@ -103,7 +103,7 @@ _MCISTR_printtf(char *buf, UINT16 uDevType, DWORD timef, DWORD val)
MCI_TMSF_FRAME(val));
break;
default:
FIXME(mci, "missing timeformat for %ld, report.\n", timef);
FIXME("missing timeformat for %ld, report.\n", timef);
strcpy(buf, "0"); /* hmm */
break;
}
......@@ -139,7 +139,7 @@ _MCISTR_convreturn(int type, DWORD dwReturn, LPSTR lpstrReturnString,
case MCI_SEQ_SMPTE: _MCI_STR("smpte"); break;
case MCI_SEQ_FILE: _MCI_STR("file"); break;
case MCI_SEQ_MIDI: _MCI_STR("midi"); break;
default:FIXME(mci, "missing sequencer mode %ld\n", dwReturn);
default:FIXME("missing sequencer mode %ld\n", dwReturn);
}
break;
case _MCISTR_mode:
......@@ -182,7 +182,7 @@ _MCISTR_convreturn(int type, DWORD dwReturn, LPSTR lpstrReturnString,
case MCI_FORMAT_MSF: _MCI_STR("msf"); break;
case MCI_FORMAT_TMSF: _MCI_STR("tmsf"); break;
default:
FIXME(mci, "missing timefmt for %d, report.\n", timef);
FIXME("missing timefmt for %d, report.\n", timef);
break;
}
break;
......@@ -207,12 +207,12 @@ _MCISTR_convreturn(int type, DWORD dwReturn, LPSTR lpstrReturnString,
case MCI_DEVTYPE_OTHER: _MCI_STR("other"); break;
case MCI_DEVTYPE_WAVEFORM_AUDIO:_MCI_STR("waveform audio"); break;
case MCI_DEVTYPE_SEQUENCER: _MCI_STR("sequencer"); break;
default:FIXME(mci, "unknown device type %ld, report.\n",
default:FIXME("unknown device type %ld, report.\n",
dwReturn);break;
}
break;
default:
FIXME(mci, "unknown resulttype %d, report.\n", type);
FIXME("unknown resulttype %d, report.\n", type);
break;
}
}
......@@ -361,7 +361,7 @@ MCISTR_Open(_MCISTR_PROTO_)
} else if (sscanf(keywords[i+1], "%ld", &st)) {
pU->animopenParams.dwStyle |= st;
} else
FIXME(mci, "unknown 'style' keyword %s, please report.\n", keywords[i+1]);
FIXME("unknown 'style' keyword %s, please report.\n", keywords[i+1]);
i += 2;
continue;
}
......@@ -387,7 +387,7 @@ MCISTR_Open(_MCISTR_PROTO_)
} else if (sscanf(keywords[i+1], "%ld", &st)) {
pU->dgvopenParams.dwStyle |= st;
} else
FIXME(mci, "unknown 'style' keyword %s, please report.\n", keywords[i+1]);
FIXME("unknown 'style' keyword %s, please report.\n", keywords[i+1]);
i += 2;
continue;
}
......@@ -419,13 +419,13 @@ MCISTR_Open(_MCISTR_PROTO_)
} else if (sscanf(keywords[i+1], "%ld", &st)) {
pU->ovlyopenParams.dwStyle |= st;
} else
FIXME(mci, "unknown 'style' keyword %s, please report.\n", keywords[i+1]);
FIXME("unknown 'style' keyword %s, please report.\n", keywords[i+1]);
i += 2;
continue;
}
break;
}
FIXME(mci, "unknown parameter passed %s, please report.\n",
FIXME("unknown parameter passed %s, please report.\n",
keywords[i]);
i++;
}
......@@ -775,7 +775,7 @@ MCISTR_Status(_MCISTR_PROTO_) {
ITEM2("window", "maximized",MCI_DGV_STATUS_WINDOW_MAXIMIZED , _MCISTR_bool);
break;
}
FIXME(mci, "unknown keyword '%s'\n", keywords[i]);
FIXME("unknown keyword '%s'\n", keywords[i]);
i++;
}
if (!pU->statusParams.dwItem)
......@@ -1251,7 +1251,7 @@ MCISTR_Record(_MCISTR_PROTO_) {
parsestr="%d:%d:%d:%d";
nrargs=4;
break;
default:FIXME(mci, "unknown timeformat %d, please report.\n", timef);
default:FIXME("unknown timeformat %d, please report.\n", timef);
parsestr="%d";
nrargs=1;
break;
......@@ -1345,7 +1345,7 @@ MCISTR_Play(_MCISTR_PROTO_) {
parsestr="%d:%d:%d:%d";
nrargs=4;
break;
default:FIXME(mci, "unknown timeformat %d, please report.\n", timef);
default:FIXME("unknown timeformat %d, please report.\n", timef);
parsestr="%d";
nrargs=1;
break;
......@@ -1448,7 +1448,7 @@ MCISTR_Seek(_MCISTR_PROTO_) {
nrargs=4;
break;
default:
FIXME(mci, "unknown timeformat %d, please report.\n", timef);
FIXME("unknown timeformat %d, please report.\n", timef);
parsestr="%d";
nrargs=1;
break;
......@@ -1775,7 +1775,7 @@ MCISTR_Delete(_MCISTR_PROTO_) {
parsestr="%d:%d:%d:%d";
nrargs=4;
break;
default:FIXME(mci, "unknown timeformat %d, please report.\n", timef);
default:FIXME("unknown timeformat %d, please report.\n", timef);
parsestr="%d";
nrargs=1;
break;
......@@ -2542,7 +2542,7 @@ DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrReturnString,
DWORD dwFlags;
int res = 0, i, nrofkeywords;
TRACE(mci, "('%s', %p, %d, %X)\n",
TRACE("('%s', %p, %d, %X)\n",
lpstrCommand, lpstrReturnString, uReturnLength, hwndCallback);
/* format is <command> <device> <optargs> */
......@@ -2591,7 +2591,7 @@ DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrReturnString,
*s = '\0';
while (*++s == ' ');
}
TRACE(mci, "[%d] => '%s'\n", i-1, keywords[i-1]);
TRACE("[%d] => '%s'\n", i-1, keywords[i-1]);
}
keywords[i] = NULL;
} else {
......@@ -2620,7 +2620,7 @@ DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrReturnString,
if (STRCMP(cmd, "open") != 0) {
wDevID = mciGetDeviceIDA(dev);
if (wDevID == 0) {
TRACE(mci, "Device '%s' not found!\n", dev);
TRACE("Device '%s' not found!\n", dev);
res = MCIERR_INVALID_DEVICE_NAME;
goto the_end;
}
......@@ -2639,7 +2639,7 @@ DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrReturnString,
}
}
if (MCISTR_cmdtable[i].cmd == NULL) {
FIXME(mci, "('%s', %p, %u, %X): unimplemented, please report.\n",
FIXME("('%s', %p, %u, %X): unimplemented, please report.\n",
lpstrCommand, lpstrReturnString, uReturnLength, hwndCallback);
res = MCIERR_MISSING_COMMAND_STRING;
}
......@@ -2681,7 +2681,7 @@ DWORD WINAPI mciExecute(LPCSTR lpstrCommand)
char strRet[256];
DWORD ret;
TRACE(mci, "(%s)!\n", lpstrCommand);
TRACE("(%s)!\n", lpstrCommand);
ret = mciSendString16(lpstrCommand, strRet, sizeof(strRet), 0);
if (ret != 0) {
......
multimedia/msvideo.c
View file @ 359f497e
......@@ -10,7 +10,7 @@
#include "vfw.h"
#include "wine/winestring.h"
#include "driver.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(msvideo)
......@@ -40,7 +40,7 @@ ICInfo(
char type[5],buf[2000];
memcpy(type,&fccType,4);type[4]=0;
TRACE(msvideo,"(%s,%ld,%p).\n",type,fccHandler,lpicinfo);
TRACE("(%s,%ld,%p).\n",type,fccHandler,lpicinfo);
/* does OpenDriver/CloseDriver */
lpicinfo->dwSize = sizeof(ICINFO);
lpicinfo->fccType = fccType;
......@@ -73,7 +73,7 @@ ICOpen(DWORD fccType,DWORD fccHandler,UINT wMode) {
memcpy(type,&fccType,4);type[4]=0;
memcpy(handler,&fccHandler,4);handler[4]=0;
TRACE(msvideo,"(%s,%s,0x%08lx)\n",type,handler,(DWORD)wMode);
TRACE("(%s,%s,0x%08lx)\n",type,handler,(DWORD)wMode);
sprintf(codecname,"%s.%s",type,handler);
/* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the
......@@ -108,7 +108,7 @@ FARPROC lpfnHandler) {
memcpy(type,&fccType,4);type[4]=0;
memcpy(handler,&fccHandler,4);handler[4]=0;
FIXME(msvideo,"(%s,%s,%d,%p), stub!\n",type,handler,wMode,lpfnHandler);
FIXME("(%s,%s,%d,%p), stub!\n",type,handler,wMode,lpfnHandler);
hic = ICOpen(fccType,fccHandler,wMode);
if (!hic)
return hic;
......@@ -122,9 +122,9 @@ LRESULT WINAPI
ICGetInfo(HIC hic,ICINFO *picinfo,DWORD cb) {
LRESULT ret;
TRACE(msvideo,"(0x%08lx,%p,%ld)\n",(DWORD)hic,picinfo,cb);
TRACE("(0x%08lx,%p,%ld)\n",(DWORD)hic,picinfo,cb);
ret = ICSendMessage(hic,ICM_GETINFO,(DWORD)picinfo,cb);
TRACE(msvideo," -> 0x%08lx\n",ret);
TRACE(" -> 0x%08lx\n",ret);
return ret;
}
......@@ -150,7 +150,7 @@ ICLocate(
querymsg = ICM_DRAW_QUERY;
break;
default:
FIXME(msvideo,"Unknown mode (%d)\n",wMode);
FIXME("Unknown mode (%d)\n",wMode);
return 0;
}
......@@ -168,7 +168,7 @@ ICLocate(
if (hic)
return hic;
}
FIXME(msvideo,"(%s,%s,%p,%p,0x%04x),unhandled!\n",type,handler,lpbiIn,lpbiOut,wMode);
FIXME("(%s,%s,%p,%p,0x%04x),unhandled!\n",type,handler,lpbiIn,lpbiOut,wMode);
return 0;
}
......@@ -179,7 +179,7 @@ HIC VFWAPI ICGetDisplayFormat(
HIC tmphic = hic;
LRESULT lres;
FIXME(msvideo,"(0x%08lx,%p,%p,%d,%d,%d),stub!\n",(DWORD)hic,lpbiIn,lpbiOut,depth,dx,dy);
FIXME("(0x%08lx,%p,%p,%d,%d,%d),stub!\n",(DWORD)hic,lpbiIn,lpbiOut,depth,dx,dy);
if (!tmphic) {
tmphic=ICLocate(ICTYPE_VIDEO,0,lpbiIn,NULL,ICMODE_DECOMPRESS);
if (!tmphic)
......@@ -260,7 +260,7 @@ ICSendMessage(HIC hic,UINT msg,DWORD lParam1,DWORD lParam2) {
LRESULT ret;
WINE_HIC *whic = (WINE_HIC*)hic;
#define XX(x) case x: TRACE(msvideo,"(0x%08lx,"#x",0x%08lx,0x%08lx)\n",(DWORD)hic,lParam1,lParam2);break;
#define XX(x) case x: TRACE("(0x%08lx,"#x",0x%08lx,0x%08lx)\n",(DWORD)hic,lParam1,lParam2);break;
switch (msg) {
XX(ICM_ABOUT)
......@@ -304,16 +304,16 @@ ICSendMessage(HIC hic,UINT msg,DWORD lParam1,DWORD lParam2) {
XX(ICM_DECOMPRESSEX_END)
XX(ICM_SET_STATUS_PROC)
default:
FIXME(msvideo,"(0x%08lx,0x%08lx,0x%08lx,0x%08lx)\n",(DWORD)hic,(DWORD)msg,lParam1,lParam2);
FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx)\n",(DWORD)hic,(DWORD)msg,lParam1,lParam2);
}
#if 0
if (whic->driverproc) {
FIXME(msvideo,"(0x%08lx,0x%08lx,0x%08lx,0x%08lx), calling %p\n",(DWORD)hic,(DWORD)msg,lParam1,lParam2,whic->driverproc);
FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx), calling %p\n",(DWORD)hic,(DWORD)msg,lParam1,lParam2,whic->driverproc);
ret = whic->driverproc(whic->hdrv,1,msg,lParam1,lParam2);
} else
#endif
ret = SendDriverMessage(whic->hdrv,msg,lParam1,lParam2);
TRACE(msvideo," -> 0x%08lx\n",ret);
TRACE(" -> 0x%08lx\n",ret);
return ret;
}
......@@ -370,7 +370,7 @@ DWORD VFWAPIV ICDraw(
LRESULT WINAPI ICClose(HIC hic) {
WINE_HIC *whic = (WINE_HIC*)hic;
TRACE(msvideo,"(%d).\n",hic);
TRACE("(%d).\n",hic);
/* FIXME: correct? */
CloseDriver(whic->hdrv,0,0);
HeapFree(GetProcessHeap(),0,whic);
......@@ -379,7 +379,7 @@ LRESULT WINAPI ICClose(HIC hic) {
HANDLE /* HDRAWDIB */ WINAPI
DrawDibOpen( void ) {
FIXME(msvideo,"stub!\n");
FIXME("stub!\n");
return 0xdead;
}
......@@ -391,7 +391,7 @@ BOOL VFWAPI DrawDibBegin(HANDLE /*HDRAWDIB*/ hdd,
INT dxSrc,
INT dySrc,
UINT wFlags) {
FIXME(msvideo,"(%d,0x%lx,%d,%d,%p,%d,%d,0x%08lx), stub!\n",
FIXME("(%d,0x%lx,%d,%d,%p,%d,%d,0x%08lx), stub!\n",
hdd,(DWORD)hdc,dxDst,dyDst,lpbi,dxSrc,dySrc,(DWORD)wFlags
);
return TRUE;
......@@ -400,28 +400,28 @@ BOOL VFWAPI DrawDibBegin(HANDLE /*HDRAWDIB*/ hdd,
BOOL VFWAPI
DrawDibSetPalette(HANDLE /*HDRAWDIB*/ hdd, HPALETTE hpal) {
FIXME(msvideo,"(%d,%d),stub!\n",hdd,hpal);
FIXME("(%d,%d),stub!\n",hdd,hpal);
return TRUE;
}
UINT VFWAPI DrawDibRealize(HANDLE /*HDRAWDIB*/ hdd, HDC hdc, BOOL fBackground) {
FIXME(msvideo,"(0x%08lx,0x%08lx,%d),stub!\n",(DWORD)hdd,(DWORD)hdc,fBackground);
FIXME("(0x%08lx,0x%08lx,%d),stub!\n",(DWORD)hdd,(DWORD)hdc,fBackground);
return 0;
}
HWND VFWAPIV MCIWndCreate (HWND hwndParent, HINSTANCE hInstance,
DWORD dwStyle,LPVOID szFile)
{ FIXME(msvideo,"%x %x %lx %p\n",hwndParent, hInstance, dwStyle, szFile);
{ FIXME("%x %x %lx %p\n",hwndParent, hInstance, dwStyle, szFile);
return 0;
}
HWND VFWAPIV MCIWndCreateA(HWND hwndParent, HINSTANCE hInstance,
DWORD dwStyle,LPCSTR szFile)
{ FIXME(msvideo,"%x %x %lx %s\n",hwndParent, hInstance, dwStyle, szFile);
{ FIXME("%x %x %lx %s\n",hwndParent, hInstance, dwStyle, szFile);
return 0;
}
HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,
DWORD dwStyle,LPCWSTR szFile)
{ FIXME(msvideo,"%x %x %lx %s\n",hwndParent, hInstance, dwStyle, debugstr_w(szFile));
{ FIXME("%x %x %lx %s\n",hwndParent, hInstance, dwStyle, debugstr_w(szFile));
return 0;
}
ole/antimoniker.c
View file @ 359f497e
......@@ -6,7 +6,7 @@
#include <assert.h>
#include "winerror.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
......@@ -128,7 +128,7 @@ HRESULT WINAPI AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void**
{
ICOM_THIS(AntiMonikerImpl,iface);
TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
......@@ -164,7 +164,7 @@ ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker* iface)
{
ICOM_THIS(AntiMonikerImpl,iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
return ++(This->ref);
}
......@@ -176,7 +176,7 @@ ULONG WINAPI AntiMonikerImpl_Release(IMoniker* iface)
{
ICOM_THIS(AntiMonikerImpl,iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
This->ref--;
......@@ -195,7 +195,7 @@ ULONG WINAPI AntiMonikerImpl_Release(IMoniker* iface)
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_GetClassID(const IMoniker* iface,CLSID *pClassID)
{
TRACE(ole,"(%p,%p),stub!\n",iface,pClassID);
TRACE("(%p,%p),stub!\n",iface,pClassID);
if (pClassID==NULL)
return E_POINTER;
......@@ -214,7 +214,7 @@ HRESULT WINAPI AntiMonikerImpl_IsDirty(IMoniker* iface)
method in the OLE-provided moniker interfaces always return S_FALSE because
their internal state never changes. */
TRACE(ole,"(%p)\n",iface);
TRACE("(%p)\n",iface);
return S_FALSE;
}
......@@ -256,7 +256,7 @@ HRESULT WINAPI AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDir
HRESULT WINAPI AntiMonikerImpl_GetSizeMax(IMoniker* iface,
ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */
{
TRACE(ole,"(%p,%p)\n",iface,pcbSize);
TRACE("(%p,%p)\n",iface,pcbSize);
if (pcbSize!=NULL)
return E_POINTER;
......@@ -278,7 +278,7 @@ HRESULT WINAPI AntiMonikerImpl_GetSizeMax(IMoniker* iface,
HRESULT WINAPI AntiMonikerImpl_Construct(AntiMonikerImpl* This)
{
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
/* Initialize the virtual fgunction table. */
This->lpvtbl1 = &VT_AntiMonikerImpl;
......@@ -293,7 +293,7 @@ HRESULT WINAPI AntiMonikerImpl_Construct(AntiMonikerImpl* This)
*******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_Destroy(AntiMonikerImpl* This)
{
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
return HeapFree(GetProcessHeap(),0,This);
}
......@@ -307,7 +307,7 @@ HRESULT WINAPI AntiMonikerImpl_BindToObject(IMoniker* iface,
REFIID riid,
VOID** ppvResult)
{
TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
return E_NOTIMPL;
}
......@@ -320,7 +320,7 @@ HRESULT WINAPI AntiMonikerImpl_BindToStorage(IMoniker* iface,
REFIID riid,
VOID** ppvResult)
{
TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
return E_NOTIMPL;
}
......@@ -333,7 +333,7 @@ HRESULT WINAPI AntiMonikerImpl_Reduce(IMoniker* iface,
IMoniker** ppmkToLeft,
IMoniker** ppmkReduced)
{
TRACE(ole,"(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
......@@ -353,7 +353,7 @@ HRESULT WINAPI AntiMonikerImpl_ComposeWith(IMoniker* iface,
IMoniker** ppmkComposite)
{
TRACE(ole,"(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
if ((ppmkComposite==NULL)||(pmkRight==NULL))
return E_POINTER;
......@@ -371,7 +371,7 @@ HRESULT WINAPI AntiMonikerImpl_ComposeWith(IMoniker* iface,
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker)
{
TRACE(ole,"(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
if (ppenumMoniker == NULL)
return E_POINTER;
......@@ -388,7 +388,7 @@ HRESULT WINAPI AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker
{
DWORD mkSys;
TRACE(ole,"(%p,%p)\n",iface,pmkOtherMoniker);
TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
if (pmkOtherMoniker==NULL)
return S_FALSE;
......@@ -425,7 +425,7 @@ HRESULT WINAPI AntiMonikerImpl_IsRunning(IMoniker* iface,
IRunningObjectTable* rot;
HRESULT res;
TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
if (pbc==NULL)
return E_INVALIDARG;
......@@ -450,7 +450,7 @@ HRESULT WINAPI AntiMonikerImpl_GetTimeOfLastChange(IMoniker* iface,
IMoniker* pmkToLeft,
FILETIME* pAntiTime)
{
TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pAntiTime);
TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pAntiTime);
return E_NOTIMPL;
}
......@@ -459,7 +459,7 @@ HRESULT WINAPI AntiMonikerImpl_GetTimeOfLastChange(IMoniker* iface,
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk)
{
TRACE(ole,"(%p,%p)\n",iface,ppmk);
TRACE("(%p,%p)\n",iface,ppmk);
if (ppmk==NULL)
return E_POINTER;
......@@ -497,7 +497,7 @@ HRESULT WINAPI AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOth
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath)
{
TRACE(ole,"(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
if (ppmkRelPath==NULL)
return E_POINTER;
......@@ -519,13 +519,13 @@ HRESULT WINAPI AntiMonikerImpl_GetDisplayName(IMoniker* iface,
{
WCHAR back[]={'\\','.','.',0};
TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
if (ppszDisplayName==NULL)
return E_POINTER;
if (pmkToLeft!=NULL){
FIXME(ole,"() pmkToLeft!=NULL not implemented \n");
FIXME("() pmkToLeft!=NULL not implemented \n");
return E_NOTIMPL;
}
......@@ -549,7 +549,7 @@ HRESULT WINAPI AntiMonikerImpl_ParseDisplayName(IMoniker* iface,
ULONG* pchEaten,
IMoniker** ppmkOut)
{
TRACE(ole,"(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut);
TRACE("(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut);
return E_NOTIMPL;
}
......@@ -558,7 +558,7 @@ HRESULT WINAPI AntiMonikerImpl_ParseDisplayName(IMoniker* iface,
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
{
TRACE(ole,"(%p,%p)\n",iface,pwdMksys);
TRACE("(%p,%p)\n",iface,pwdMksys);
if (!pwdMksys)
return E_POINTER;
......@@ -576,7 +576,7 @@ HRESULT WINAPI AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid
ICOM_THIS_From_IROTData(IMoniker, iface);
TRACE(ole,"(%p,%p,%p)\n",iface,riid,ppvObject);
TRACE("(%p,%p,%p)\n",iface,riid,ppvObject);
return AntiMonikerImpl_QueryInterface(This, riid, ppvObject);
}
......@@ -588,7 +588,7 @@ ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface)
{
ICOM_THIS_From_IROTData(IMoniker, iface);
TRACE(ole,"(%p)\n",iface);
TRACE("(%p)\n",iface);
return AntiMonikerImpl_AddRef(This);
}
......@@ -600,7 +600,7 @@ ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface)
{
ICOM_THIS_From_IROTData(IMoniker, iface);
TRACE(ole,"(%p)\n",iface);
TRACE("(%p)\n",iface);
return AntiMonikerImpl_Release(This);
}
......@@ -613,7 +613,7 @@ HRESULT WINAPI AntiMonikerROTDataImpl_GetComparaisonData(IROTData* iface,
ULONG cbMax,
ULONG* pcbData)
{
FIXME(ole,"(),stub!\n");
FIXME("(),stub!\n");
return E_NOTIMPL;
}
......@@ -626,7 +626,7 @@ HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk)
HRESULT hr = S_OK;
IID riid=IID_IMoniker;
TRACE(ole,"(%p)\n",ppmk);
TRACE("(%p)\n",ppmk);
newAntiMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(AntiMonikerImpl));
......
ole/bindctx.c
View file @ 359f497e
......@@ -8,7 +8,7 @@
#include <assert.h>
#include "winerror.h"
#include "wine/obj_moniker.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -91,7 +91,7 @@ HRESULT WINAPI BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppv
{
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
......@@ -124,7 +124,7 @@ ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface)
{
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
return ++(This->ref);
}
......@@ -136,7 +136,7 @@ ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface)
{
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
This->ref--;
......@@ -158,7 +158,7 @@ ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface)
*******************************************************************************/
HRESULT WINAPI BindCtxImpl_Construct(BindCtxImpl* This)
{
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
/* Initialize the virtual function table.*/
This->lpvtbl = &VT_BindCtxImpl;
......@@ -191,7 +191,7 @@ HRESULT WINAPI BindCtxImpl_Construct(BindCtxImpl* This)
*******************************************************************************/
HRESULT WINAPI BindCtxImpl_Destroy(BindCtxImpl* This)
{
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
/* free the table space memory */
HeapFree(GetProcessHeap(),0,This->bindCtxTable);
......@@ -213,7 +213,7 @@ HRESULT WINAPI BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk)
DWORD lastIndex=This->bindCtxTableLastIndex;
BindCtxObject cell;
TRACE(ole,"(%p,%p)\n",This,punk);
TRACE("(%p,%p)\n",This,punk);
if (punk==NULL)
return E_POINTER;
......@@ -230,7 +230,7 @@ HRESULT WINAPI BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk)
if (lastIndex == This->bindCtxTableSize){ /* the table is full so it must be resized */
if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){
FIXME(ole,"This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize);
FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize);
return E_FAIL;
}
......@@ -253,7 +253,7 @@ HRESULT WINAPI BindCtxImpl_RevokeObjectBound(IBindCtx* iface, IUnknown* punk)
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p,%p)\n",This,punk);
TRACE("(%p,%p)\n",This,punk);
/* check if the object was registred or not */
if (BindCtxImpl_GetObjectIndex(This,punk,NULL,&index)==S_FALSE)
......@@ -280,7 +280,7 @@ HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface)
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
for(i=0;i<This->bindCtxTableLastIndex;i++)
IUnknown_Release(This->bindCtxTable[i].pObj);
......@@ -297,7 +297,7 @@ HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts
{
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p,%p)\n",This,pbindopts);
TRACE("(%p,%p)\n",This,pbindopts);
if (pbindopts==NULL)
return E_POINTER;
......@@ -314,7 +314,7 @@ HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts
{
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p,%p)\n",This,pbindopts);
TRACE("(%p,%p)\n",This,pbindopts);
if (pbindopts==NULL)
return E_POINTER;
......@@ -333,7 +333,7 @@ HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectT
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p,%p)\n",This,pprot);
TRACE("(%p,%p)\n",This,pprot);
if (pprot==NULL)
return E_POINTER;
......@@ -350,7 +350,7 @@ HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey,
{
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p,%p,%p)\n",This,pszkey,punk);
TRACE("(%p,%p,%p)\n",This,pszkey,punk);
if (punk==NULL)
return E_INVALIDARG;
......@@ -381,7 +381,7 @@ HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey,
This->bindCtxTableSize+=BLOCK_TAB_SIZE; /* new table size */
if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){
FIXME(ole,"This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize);
FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize);
return E_FAIL;
}
This->bindCtxTable = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->bindCtxTable,
......@@ -399,7 +399,7 @@ HRESULT WINAPI BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnkn
DWORD index;
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p,%p,%p)\n",This,pszkey,punk);
TRACE("(%p,%p,%p)\n",This,pszkey,punk);
if (punk==NULL)
return E_POINTER;
......@@ -425,7 +425,7 @@ HRESULT WINAPI BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR ppenum)
ICOM_THIS(BindCtxImpl,iface);
TRACE(ole,"(%p,%p)\n",This,ppenum);
TRACE("(%p,%p)\n",This,ppenum);
if (BindCtxImpl_GetObjectIndex(This,NULL,ppenum,&index)==S_FALSE)
return E_FAIL;
......@@ -447,7 +447,7 @@ HRESULT WINAPI BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR ppenum)
******************************************************************************/
HRESULT WINAPI BindCtxImpl_EnumObjectParam(IBindCtx* iface,IEnumString** pszkey)
{
FIXME(ole,"(%p,%p),stub!\n",iface,pszkey);
FIXME("(%p,%p),stub!\n",iface,pszkey);
return E_NOTIMPL;
}
......@@ -463,7 +463,7 @@ HRESULT WINAPI BindCtxImpl_GetObjectIndex(BindCtxImpl* This,
DWORD i;
BYTE found=0;
TRACE(ole,"(%p,%p,%p,%p)\n",This,punk,pszkey,index);
TRACE("(%p,%p,%p,%p)\n",This,punk,pszkey,index);
if (punk==NULL)
/* search object identified by a register key */
......@@ -501,7 +501,7 @@ HRESULT WINAPI BindCtxImpl_GetObjectIndex(BindCtxImpl* This,
******************************************************************************/
HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC * ppbc)
{
FIXME(ole,"(%ld,%p),stub!\n",reserved,ppbc);
FIXME("(%ld,%p),stub!\n",reserved,ppbc);
return E_NOTIMPL;
}
......@@ -514,7 +514,7 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc)
HRESULT hr;
IID riid=IID_IBindCtx;
TRACE(ole,"(%ld,%p)\n",reserved,ppbc);
TRACE("(%ld,%p)\n",reserved,ppbc);
newBindCtx = HeapAlloc(GetProcessHeap(), 0, sizeof(BindCtxImpl));
......
ole/datacache.c
View file @ 359f497e
......@@ -35,7 +35,7 @@
#include "winuser.h"
#include "winerror.h"
#include "ole2.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -449,7 +449,7 @@ HRESULT WINAPI CreateDataCache(
WINE_StringFromCLSID((LPCLSID)rclsid,xclsid);
WINE_StringFromCLSID((LPCLSID)riid,xriid);
TRACE(ole, "(%s, %p, %s, %p)\n", xclsid, pUnkOuter, xriid, ppvObj);
TRACE("(%s, %p, %s, %p)\n", xclsid, pUnkOuter, xriid, ppvObj);
/*
* Sanity check
......@@ -550,7 +550,7 @@ static DataCache* DataCache_Construct(
static void DataCache_Destroy(
DataCache* ptrToDestroy)
{
TRACE(ole, "()\n");
TRACE("()\n");
if (ptrToDestroy->sinkInterface != NULL)
{
......@@ -650,7 +650,7 @@ static void DataCache_FireOnViewChange(
DWORD aspect,
LONG lindex)
{
TRACE(ole, "(%p, %lx, %ld)\n", this, aspect, lindex);
TRACE("(%p, %lx, %ld)\n", this, aspect, lindex);
/*
* The sink supplies a filter when it registers
......@@ -888,7 +888,7 @@ static HRESULT WINAPI DataCache_NDIUnknown_QueryInterface(
WINE_StringFromCLSID((LPCLSID)riid,clsid);
WARN(ole,
WARN(
"() : asking for un supported interface %s\n",
clsid);
......@@ -1004,7 +1004,7 @@ static HRESULT WINAPI DataCache_GetData(
LPFORMATETC pformatetcIn,
STGMEDIUM* pmedium)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1013,7 +1013,7 @@ static HRESULT WINAPI DataCache_GetDataHere(
LPFORMATETC pformatetc,
STGMEDIUM* pmedium)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1021,7 +1021,7 @@ static HRESULT WINAPI DataCache_QueryGetData(
IDataObject* iface,
LPFORMATETC pformatetc)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1037,7 +1037,7 @@ static HRESULT WINAPI DataCache_GetCanonicalFormatEtc(
LPFORMATETC pformatectIn,
LPFORMATETC pformatetcOut)
{
TRACE(ole,"()\n");
TRACE("()\n");
return E_NOTIMPL;
}
......@@ -1057,7 +1057,7 @@ static HRESULT WINAPI DataCache_IDataObject_SetData(
IOleCache2* oleCache = NULL;
HRESULT hres;
TRACE(ole,"(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
TRACE("(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
hres = IDataObject_QueryInterface(iface, &IID_IOleCache2, (void**)&oleCache);
......@@ -1083,7 +1083,7 @@ static HRESULT WINAPI DataCache_EnumFormatEtc(
DWORD dwDirection,
IEnumFORMATETC** ppenumFormatEtc)
{
TRACE(ole,"()\n");
TRACE("()\n");
return E_NOTIMPL;
}
......@@ -1101,7 +1101,7 @@ static HRESULT WINAPI DataCache_DAdvise(
IAdviseSink* pAdvSink,
DWORD* pdwConnection)
{
TRACE(ole,"()\n");
TRACE("()\n");
return OLE_E_ADVISENOTSUPPORTED;
}
......@@ -1116,7 +1116,7 @@ static HRESULT WINAPI DataCache_DUnadvise(
IDataObject* iface,
DWORD dwConnection)
{
TRACE(ole,"()\n");
TRACE("()\n");
return OLE_E_NOCONNECTION;
}
......@@ -1131,7 +1131,7 @@ static HRESULT WINAPI DataCache_EnumDAdvise(
IDataObject* iface,
IEnumSTATDATA** ppenumAdvise)
{
TRACE(ole,"()\n");
TRACE("()\n");
return OLE_E_ADVISENOTSUPPORTED;
}
......@@ -1192,7 +1192,7 @@ static HRESULT WINAPI DataCache_GetClassID(
const IPersistStorage* iface,
CLSID* pClassID)
{
TRACE(ole,"(%p, %p)\n", iface, pClassID);
TRACE("(%p, %p)\n", iface, pClassID);
return E_NOTIMPL;
}
......@@ -1207,7 +1207,7 @@ static HRESULT WINAPI DataCache_GetClassID(
static HRESULT WINAPI DataCache_IsDirty(
IPersistStorage* iface)
{
TRACE(ole,"(%p)\n", iface);
TRACE("(%p)\n", iface);
return S_FALSE;
}
......@@ -1224,7 +1224,7 @@ static HRESULT WINAPI DataCache_InitNew(
IPersistStorage* iface,
IStorage* pStg)
{
TRACE(ole, "(%p, %p)\n", iface, pStg);
TRACE("(%p, %p)\n", iface, pStg);
return DataCache_Load(iface, pStg);
}
......@@ -1245,7 +1245,7 @@ static HRESULT WINAPI DataCache_Load(
{
_ICOM_THIS_From_IPersistStorage(DataCache, iface);
TRACE(ole, "(%p, %p)\n", iface, pStg);
TRACE("(%p, %p)\n", iface, pStg);
if (this->presentationStorage != NULL)
{
......@@ -1279,7 +1279,7 @@ static HRESULT WINAPI DataCache_Save(
{
_ICOM_THIS_From_IPersistStorage(DataCache, iface);
TRACE(ole, "(%p, %p, %d)\n", iface, pStg, fSameAsLoad);
TRACE("(%p, %p, %d)\n", iface, pStg, fSameAsLoad);
if ( (!fSameAsLoad) &&
(this->presentationStorage!=NULL) )
......@@ -1306,7 +1306,7 @@ static HRESULT WINAPI DataCache_SaveCompleted(
IPersistStorage* iface,
IStorage* pStgNew)
{
TRACE(ole, "(%p, %p)\n", iface, pStgNew);
TRACE("(%p, %p)\n", iface, pStgNew);
/*
* First, make sure we get our hands off any storage we have.
......@@ -1334,7 +1334,7 @@ static HRESULT WINAPI DataCache_HandsOffStorage(
{
_ICOM_THIS_From_IPersistStorage(DataCache, iface);
TRACE(ole,"(%p)\n", iface);
TRACE("(%p)\n", iface);
if (this->presentationStorage != NULL)
{
......@@ -1418,7 +1418,7 @@ static HRESULT WINAPI DataCache_Draw(
_ICOM_THIS_From_IViewObject2(DataCache, iface);
TRACE(ole,"(%p, %lx, %ld, %p, %x, %x, %p, %p, %p, %lx)\n",
TRACE("(%p, %lx, %ld, %p, %x, %x, %p, %p, %p, %lx)\n",
iface,
dwDrawAspect,
lindex,
......@@ -1515,7 +1515,7 @@ static HRESULT WINAPI DataCache_GetColorSet(
HDC hicTargetDevice,
LOGPALETTE** ppColorSet)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1526,7 +1526,7 @@ static HRESULT WINAPI DataCache_Freeze(
void* pvAspect,
DWORD* pdwFreeze)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1534,7 +1534,7 @@ static HRESULT WINAPI DataCache_Unfreeze(
IViewObject2* iface,
DWORD dwFreeze)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1554,7 +1554,7 @@ static HRESULT WINAPI DataCache_SetAdvise(
{
_ICOM_THIS_From_IViewObject2(DataCache, iface);
TRACE(ole,"(%p, %lx, %lx, %p)\n", iface, aspects, advf, pAdvSink);
TRACE("(%p, %lx, %lx, %p)\n", iface, aspects, advf, pAdvSink);
/*
* A call to this function removes the previous sink
......@@ -1609,7 +1609,7 @@ static HRESULT WINAPI DataCache_GetAdvise(
{
_ICOM_THIS_From_IViewObject2(DataCache, iface);
TRACE(ole,"(%p, %p, %p, %p)\n", iface, pAspects, pAdvf, ppAdvSink);
TRACE("(%p, %p, %p, %p)\n", iface, pAspects, pAdvf, ppAdvSink);
/*
* Just copy all the requested values.
......@@ -1649,7 +1649,7 @@ static HRESULT WINAPI DataCache_GetExtent(
_ICOM_THIS_From_IViewObject2(DataCache, iface);
TRACE(ole, "(%p, %lx, %ld, %p, %p)\n",
TRACE("(%p, %lx, %ld, %p, %p)\n",
iface, dwDrawAspect, lindex, ptd, lpsizel);
/*
......@@ -1668,14 +1668,14 @@ static HRESULT WINAPI DataCache_GetExtent(
* This flag should be set to -1.
*/
if (lindex!=-1)
FIXME(ole, "Unimplemented flag lindex = %ld\n", lindex);
FIXME("Unimplemented flag lindex = %ld\n", lindex);
/*
* Right now, we suport only the callback from
* the default handler.
*/
if (ptd!=NULL)
FIXME(ole, "Unimplemented ptd = %p\n", ptd);
FIXME("Unimplemented ptd = %p\n", ptd);
/*
* Get the presentation information from the
......@@ -1753,7 +1753,7 @@ static HRESULT WINAPI DataCache_Cache(
DWORD advf,
DWORD* pdwConnection)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1761,7 +1761,7 @@ static HRESULT WINAPI DataCache_Uncache(
IOleCache2* iface,
DWORD dwConnection)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1769,7 +1769,7 @@ static HRESULT WINAPI DataCache_EnumCache(
IOleCache2* iface,
IEnumSTATDATA** ppenumSTATDATA)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1777,7 +1777,7 @@ static HRESULT WINAPI DataCache_InitCache(
IOleCache2* iface,
IDataObject* pDataObject)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1787,7 +1787,7 @@ static HRESULT WINAPI DataCache_IOleCache2_SetData(
STGMEDIUM* pmedium,
BOOL fRelease)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1797,7 +1797,7 @@ static HRESULT WINAPI DataCache_UpdateCache(
DWORD grfUpdf,
LPVOID pReserved)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1805,7 +1805,7 @@ static HRESULT WINAPI DataCache_DiscardCache(
IOleCache2* iface,
DWORD dwDiscardOptions)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......@@ -1860,14 +1860,14 @@ static HRESULT WINAPI DataCache_OnRun(
IOleCacheControl* iface,
LPDATAOBJECT pDataObject)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
static HRESULT WINAPI DataCache_OnStop(
IOleCacheControl* iface)
{
FIXME(ole,"stub\n");
FIXME("stub\n");
return E_NOTIMPL;
}
......
ole/defaulthandler.c
View file @ 359f497e
......@@ -35,7 +35,7 @@
#include "winuser.h"
#include "winerror.h"
#include "ole2.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -387,7 +387,7 @@ HRESULT WINAPI OleCreateDefaultHandler(
WINE_StringFromCLSID((LPCLSID)clsid,xclsid);
WINE_StringFromCLSID((LPCLSID)riid,xriid);
TRACE(ole, "(%s, %p, %s, %p)\n", xclsid, pUnkOuter, xriid, ppvObj);
TRACE("(%s, %p, %s, %p)\n", xclsid, pUnkOuter, xriid, ppvObj);
/*
* Sanity check
......@@ -623,7 +623,7 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface(
WINE_StringFromCLSID((LPCLSID)riid,clsid);
WARN(ole,
WARN(
"() : asking for un supported interface %s\n",
clsid);
......@@ -748,7 +748,7 @@ static HRESULT WINAPI DefaultHandler_SetClientSite(
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %p)\n", iface, pClientSite);
TRACE("(%p, %p)\n", iface, pClientSite);
/*
* Make sure we release the previous client site if there
......@@ -814,7 +814,7 @@ static HRESULT WINAPI DefaultHandler_SetHostNames(
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %s, %s)\n",
TRACE("(%p, %s, %s)\n",
iface,
debugstr_w(szContainerApp),
debugstr_w(szContainerObj));
......@@ -858,7 +858,7 @@ static HRESULT WINAPI DefaultHandler_Close(
IOleObject* iface,
DWORD dwSaveOption)
{
TRACE(ole, "()\n");
TRACE("()\n");
return S_OK;
}
......@@ -874,7 +874,7 @@ static HRESULT WINAPI DefaultHandler_SetMoniker(
DWORD dwWhichMoniker,
IMoniker* pmk)
{
TRACE(ole, "(%p, %ld, %p)\n",
TRACE("(%p, %ld, %p)\n",
iface,
dwWhichMoniker,
pmk);
......@@ -897,7 +897,7 @@ static HRESULT WINAPI DefaultHandler_GetMoniker(
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %ld, %ld, %p)\n",
TRACE("(%p, %ld, %ld, %p)\n",
iface, dwAssign, dwWhichMoniker, ppmk);
if (this->clientSite)
......@@ -925,7 +925,7 @@ static HRESULT WINAPI DefaultHandler_InitFromData(
BOOL fCreation,
DWORD dwReserved)
{
TRACE(ole, "(%p, %p, %d, %ld)\n",
TRACE("(%p, %p, %d, %ld)\n",
iface, pDataObject, fCreation, dwReserved);
return OLE_E_NOTRUNNING;
......@@ -943,7 +943,7 @@ static HRESULT WINAPI DefaultHandler_GetClipboardData(
DWORD dwReserved,
IDataObject** ppDataObject)
{
TRACE(ole, "(%p, %ld, %p)\n",
TRACE("(%p, %ld, %p)\n",
iface, dwReserved, ppDataObject);
return OLE_E_NOTRUNNING;
......@@ -958,7 +958,7 @@ static HRESULT WINAPI DefaultHandler_DoVerb(
HWND hwndParent,
LPCRECT lprcPosRect)
{
FIXME(ole, ": Stub\n");
FIXME(": Stub\n");
return E_NOTIMPL;
}
......@@ -976,7 +976,7 @@ static HRESULT WINAPI DefaultHandler_EnumVerbs(
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %p)\n", iface, ppEnumOleVerb);
TRACE("(%p, %p)\n", iface, ppEnumOleVerb);
return OleRegEnumVerbs(&this->clsid, ppEnumOleVerb);
}
......@@ -984,7 +984,7 @@ static HRESULT WINAPI DefaultHandler_EnumVerbs(
static HRESULT WINAPI DefaultHandler_Update(
IOleObject* iface)
{
FIXME(ole, ": Stub\n");
FIXME(": Stub\n");
return E_NOTIMPL;
}
......@@ -998,7 +998,7 @@ static HRESULT WINAPI DefaultHandler_Update(
static HRESULT WINAPI DefaultHandler_IsUpToDate(
IOleObject* iface)
{
TRACE(ole, "(%p)\n", iface);
TRACE("(%p)\n", iface);
return OLE_E_NOTRUNNING;
}
......@@ -1016,7 +1016,7 @@ static HRESULT WINAPI DefaultHandler_GetUserClassID(
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %p)\n", iface, pClsid);
TRACE("(%p, %p)\n", iface, pClsid);
/*
* Sanity check.
......@@ -1044,7 +1044,7 @@ static HRESULT WINAPI DefaultHandler_GetUserType(
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %ld, %p)\n", iface, dwFormOfType, pszUserType);
TRACE("(%p, %ld, %p)\n", iface, dwFormOfType, pszUserType);
return OleRegGetUserType(&this->clsid, dwFormOfType, pszUserType);
}
......@@ -1061,7 +1061,7 @@ static HRESULT WINAPI DefaultHandler_SetExtent(
DWORD dwDrawAspect,
SIZEL* psizel)
{
TRACE(ole, "(%p, %lx, (%d,%d))\n", iface, dwDrawAspect, psizel->cx, psizel->cy);
TRACE("(%p, %lx, (%d,%d))\n", iface, dwDrawAspect, psizel->cx, psizel->cy);
return OLE_E_NOTRUNNING;
}
......@@ -1084,7 +1084,7 @@ static HRESULT WINAPI DefaultHandler_GetExtent(
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %lx, %p)\n", iface, dwDrawAspect, psizel);
TRACE("(%p, %lx, %p)\n", iface, dwDrawAspect, psizel);
hres = IUnknown_QueryInterface(this->dataCache, &IID_IViewObject2, (void**)&cacheView);
......@@ -1131,7 +1131,7 @@ static HRESULT WINAPI DefaultHandler_Advise(
HRESULT hres = S_OK;
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %p, %p)\n", iface, pAdvSink, pdwConnection);
TRACE("(%p, %p, %p)\n", iface, pAdvSink, pdwConnection);
/*
* Make sure we have an advise holder before we start.
......@@ -1165,7 +1165,7 @@ static HRESULT WINAPI DefaultHandler_Unadvise(
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %ld)\n", iface, dwConnection);
TRACE("(%p, %ld)\n", iface, dwConnection);
/*
* If we don't have an advise holder yet, it means we don't have
......@@ -1192,7 +1192,7 @@ static HRESULT WINAPI DefaultHandler_EnumAdvise(
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %p)\n", iface, ppenumAdvise);
TRACE("(%p, %p)\n", iface, ppenumAdvise);
/*
* Sanity check
......@@ -1228,7 +1228,7 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus(
HRESULT hres;
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
TRACE(ole, "(%p, %lx, %p)\n", iface, dwAspect, pdwStatus);
TRACE("(%p, %lx, %p)\n", iface, dwAspect, pdwStatus);
hres = OleRegGetMiscStatus(&(this->clsid), dwAspect, pdwStatus);
......@@ -1249,7 +1249,7 @@ static HRESULT WINAPI DefaultHandler_SetColorScheme(
IOleObject* iface,
LOGPALETTE* pLogpal)
{
TRACE(ole, "(%p, %p))\n", iface, pLogpal);
TRACE("(%p, %p))\n", iface, pLogpal);
return OLE_E_NOTRUNNING;
}
......@@ -1304,7 +1304,7 @@ static HRESULT WINAPI DefaultHandler_GetData(
LPFORMATETC pformatetcIn,
STGMEDIUM* pmedium)
{
FIXME(ole, ": Stub\n");
FIXME(": Stub\n");
return E_NOTIMPL;
}
......@@ -1313,7 +1313,7 @@ static HRESULT WINAPI DefaultHandler_GetDataHere(
LPFORMATETC pformatetc,
STGMEDIUM* pmedium)
{
FIXME(ole, ": Stub\n");
FIXME(": Stub\n");
return E_NOTIMPL;
}
......@@ -1334,7 +1334,7 @@ static HRESULT WINAPI DefaultHandler_QueryGetData(
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
TRACE(ole, "(%p, %p)\n", iface, pformatetc);
TRACE("(%p, %p)\n", iface, pformatetc);
hres = IUnknown_QueryInterface(this->dataCache,
&IID_IDataObject,
......@@ -1363,7 +1363,7 @@ static HRESULT WINAPI DefaultHandler_GetCanonicalFormatEtc(
LPFORMATETC pformatectIn,
LPFORMATETC pformatetcOut)
{
FIXME(ole, "(%p, %p, %p)\n", iface, pformatectIn, pformatetcOut);
FIXME("(%p, %p, %p)\n", iface, pformatectIn, pformatetcOut);
return OLE_E_NOTRUNNING;
}
......@@ -1387,7 +1387,7 @@ static HRESULT WINAPI DefaultHandler_SetData(
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
TRACE(ole, "(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
TRACE("(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
hres = IUnknown_QueryInterface(this->dataCache,
&IID_IDataObject,
......@@ -1422,7 +1422,7 @@ static HRESULT WINAPI DefaultHandler_EnumFormatEtc(
HRESULT hres;
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
TRACE(ole, "(%p, %lx, %p)\n", iface, dwDirection, ppenumFormatEtc);
TRACE("(%p, %lx, %p)\n", iface, dwDirection, ppenumFormatEtc);
hres = OleRegEnumFormatEtc(&(this->clsid), dwDirection, ppenumFormatEtc);
......@@ -1447,7 +1447,7 @@ static HRESULT WINAPI DefaultHandler_DAdvise(
HRESULT hres = S_OK;
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
TRACE(ole, "(%p, %p, %ld, %p, %p)\n",
TRACE("(%p, %p, %ld, %p, %p)\n",
iface, pformatetc, advf, pAdvSink, pdwConnection);
/*
......@@ -1485,7 +1485,7 @@ static HRESULT WINAPI DefaultHandler_DUnadvise(
{
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
TRACE(ole, "(%p, %ld)\n", iface, dwConnection);
TRACE("(%p, %ld)\n", iface, dwConnection);
/*
* If we don't have a data advise holder yet, it means that
......@@ -1514,7 +1514,7 @@ static HRESULT WINAPI DefaultHandler_EnumDAdvise(
{
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
TRACE(ole, "(%p, %p)\n", iface, ppenumAdvise);
TRACE("(%p, %p)\n", iface, ppenumAdvise);
/*
* Sanity check
......@@ -1598,7 +1598,7 @@ static HRESULT WINAPI DefaultHandler_GetRunningClass(
IRunnableObject* iface,
LPCLSID lpClsid)
{
TRACE(ole, "()\n");
TRACE("()\n");
return S_OK;
}
......@@ -1606,7 +1606,7 @@ static HRESULT WINAPI DefaultHandler_Run(
IRunnableObject* iface,
IBindCtx* pbc)
{
FIXME(ole, ": Stub\n");
FIXME(": Stub\n");
return E_NOTIMPL;
}
......@@ -1622,7 +1622,7 @@ static HRESULT WINAPI DefaultHandler_Run(
static BOOL WINAPI DefaultHandler_IsRunning(
IRunnableObject* iface)
{
TRACE(ole, "()\n");
TRACE("()\n");
return S_FALSE;
}
......@@ -1640,7 +1640,7 @@ static HRESULT WINAPI DefaultHandler_LockRunning(
BOOL fLock,
BOOL fLastUnlockCloses)
{
TRACE(ole, "()\n");
TRACE("()\n");
return S_OK;
}
......@@ -1657,7 +1657,7 @@ static HRESULT WINAPI DefaultHandler_SetContainedObject(
IRunnableObject* iface,
BOOL fContained)
{
TRACE(ole, "()\n");
TRACE("()\n");
return S_OK;
}
ole/filemoniker.c
View file @ 359f497e
......@@ -6,7 +6,7 @@
#include <assert.h>
#include "winerror.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
......@@ -133,7 +133,7 @@ HRESULT WINAPI FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void**
{
ICOM_THIS(FileMonikerImpl,iface);
TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
......@@ -170,7 +170,7 @@ ULONG WINAPI FileMonikerImpl_AddRef(IMoniker* iface)
{
ICOM_THIS(FileMonikerImpl,iface);
TRACE(ole,"(%p)\n",iface);
TRACE("(%p)\n",iface);
return ++(This->ref);
}
......@@ -182,7 +182,7 @@ ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface)
{
ICOM_THIS(FileMonikerImpl,iface);
TRACE(ole,"(%p)\n",iface);
TRACE("(%p)\n",iface);
This->ref--;
......@@ -202,7 +202,7 @@ ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface)
HRESULT WINAPI FileMonikerImpl_GetClassID(const IMoniker* iface,
CLSID *pClassID)/* Pointer to CLSID of object */
{
TRACE(ole,"(%p,%p),stub!\n",iface,pClassID);
TRACE("(%p,%p),stub!\n",iface,pClassID);
if (pClassID==NULL)
return E_POINTER;
......@@ -221,7 +221,7 @@ HRESULT WINAPI FileMonikerImpl_IsDirty(IMoniker* iface)
method in the OLE-provided moniker interfaces always return S_FALSE because
their internal state never changes. */
TRACE(ole,"(%p)\n",iface);
TRACE("(%p)\n",iface);
return S_FALSE;
}
......@@ -240,7 +240,7 @@ HRESULT WINAPI FileMonikerImpl_Load(IMoniker* iface,IStream* pStm)
ICOM_THIS(FileMonikerImpl,iface);
TRACE(ole,"(%p,%p)\n",iface,pStm);
TRACE("(%p,%p)\n",iface,pStm);
/* this function locate and read from the stream the filePath string writen by FileMonikerImpl_Save */
......@@ -344,7 +344,7 @@ HRESULT WINAPI FileMonikerImpl_Save(IMoniker* iface,
DWORD doubleLenDec;
int i=0;
TRACE(ole,"(%p,%p,%d)\n",iface,pStm,fClearDirty);
TRACE("(%p,%p,%d)\n",iface,pStm,fClearDirty);
if (pStm==NULL)
return E_POINTER;
......@@ -404,7 +404,7 @@ HRESULT WINAPI FileMonikerImpl_GetSizeMax(IMoniker* iface,
DWORD len=lstrlenW(This->filePathName);
DWORD sizeMAx;
TRACE(ole,"(%p,%p)\n",iface,pcbSize);
TRACE("(%p,%p)\n",iface,pcbSize);
if (pcbSize!=NULL)
return E_POINTER;
......@@ -443,7 +443,7 @@ HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa
WCHAR bkSlash[]={'\\',0};
BYTE addBkSlash;
TRACE(ole,"(%p,%p)\n",This,lpszPathName);
TRACE("(%p,%p)\n",This,lpszPathName);
/* Initialize the virtual fgunction table. */
This->lpvtbl1 = &VT_FileMonikerImpl;
......@@ -507,7 +507,7 @@ HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa
*******************************************************************************/
HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* This)
{
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
if (This->filePathName!=NULL)
HeapFree(GetProcessHeap(),0,This->filePathName);
......@@ -538,7 +538,7 @@ HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface,
*ppvResult=0;
TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
if(pmkToLeft==NULL){
......@@ -591,7 +591,7 @@ HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface,
}
if (pca!=NULL){
FIXME(ole,"()");
FIXME("()");
/*res=GetClassFile(This->filePathName,&clsID);
......@@ -645,7 +645,7 @@ HRESULT WINAPI FileMonikerImpl_BindToStorage(IMoniker* iface,
IStorage *pstg=0;
HRESULT res;
TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvObject);
TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvObject);
if (pmkToLeft==NULL){
......@@ -682,7 +682,7 @@ HRESULT WINAPI FileMonikerImpl_BindToStorage(IMoniker* iface,
}
else {
FIXME(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvObject);
FIXME("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvObject);
return E_NOTIMPL;
}
......@@ -698,7 +698,7 @@ HRESULT WINAPI FileMonikerImpl_Reduce(IMoniker* iface,
IMoniker** ppmkToLeft,
IMoniker** ppmkReduced)
{
TRACE(ole,"(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
......@@ -725,7 +725,7 @@ HRESULT WINAPI FileMonikerImpl_ComposeWith(IMoniker* iface,
int i=0,j=0,lastIdx1=0,lastIdx2=0;
DWORD mkSys;
TRACE(ole,"(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
if (ppmkComposite==NULL)
return E_POINTER;
......@@ -815,7 +815,7 @@ HRESULT WINAPI FileMonikerImpl_ComposeWith(IMoniker* iface,
******************************************************************************/
HRESULT WINAPI FileMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker)
{
TRACE(ole,"(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
if (ppenumMoniker == NULL)
return E_POINTER;
......@@ -836,7 +836,7 @@ HRESULT WINAPI FileMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker
IBindCtx* bind;
HRESULT res;
TRACE(ole,"(%p,%p)\n",iface,pmkOtherMoniker);
TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
if (pmkOtherMoniker==NULL)
return S_FALSE;
......@@ -906,7 +906,7 @@ HRESULT WINAPI FileMonikerImpl_IsRunning(IMoniker* iface,
IRunningObjectTable* rot;
HRESULT res;
TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
if ( (pmkNewlyRunning!=NULL) && (IMoniker_IsEqual(pmkNewlyRunning,iface)==S_OK) )
return S_OK;
......@@ -939,7 +939,7 @@ HRESULT WINAPI FileMonikerImpl_GetTimeOfLastChange(IMoniker* iface,
HRESULT res;
WIN32_FILE_ATTRIBUTE_DATA info;
TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pFileTime);
TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pFileTime);
if (pFileTime==NULL)
return E_POINTER;
......@@ -971,7 +971,7 @@ HRESULT WINAPI FileMonikerImpl_GetTimeOfLastChange(IMoniker* iface,
HRESULT WINAPI FileMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk)
{
TRACE(ole,"(%p,%p)\n",iface,ppmk);
TRACE("(%p,%p)\n",iface,ppmk);
return CreateAntiMoniker(ppmk);
}
......@@ -1125,7 +1125,7 @@ HRESULT WINAPI FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther,
DWORD len1=0,len2=0,sameIdx=0,j=0;
WCHAR back[] ={'.','.','\\',0};
TRACE(ole,"(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
if (ppmkRelPath==NULL)
return E_POINTER;
......@@ -1201,7 +1201,7 @@ HRESULT WINAPI FileMonikerImpl_GetDisplayName(IMoniker* iface,
int len=lstrlenW(This->filePathName);
TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
if (ppszDisplayName==NULL)
return E_POINTER;
......@@ -1228,7 +1228,7 @@ HRESULT WINAPI FileMonikerImpl_ParseDisplayName(IMoniker* iface,
ULONG* pchEaten,
IMoniker** ppmkOut)
{
FIXME(ole,"(%p,%p,%p,%p,%p,%p),stub!\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut);
FIXME("(%p,%p,%p,%p,%p,%p),stub!\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut);
return E_NOTIMPL;
}
......@@ -1237,7 +1237,7 @@ HRESULT WINAPI FileMonikerImpl_ParseDisplayName(IMoniker* iface,
******************************************************************************/
HRESULT WINAPI FileMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
{
TRACE(ole,"(%p,%p)\n",iface,pwdMksys);
TRACE("(%p,%p)\n",iface,pwdMksys);
if (!pwdMksys)
return E_POINTER;
......@@ -1255,7 +1255,7 @@ HRESULT WINAPI FileMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid
ICOM_THIS_From_IROTData(IMoniker, iface);
TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
return FileMonikerImpl_QueryInterface(This, riid, ppvObject);
}
......@@ -1267,7 +1267,7 @@ ULONG WINAPI FileMonikerROTDataImpl_AddRef(IROTData *iface)
{
ICOM_THIS_From_IROTData(IMoniker, iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
return FileMonikerImpl_AddRef(This);
}
......@@ -1279,7 +1279,7 @@ ULONG WINAPI FileMonikerROTDataImpl_Release(IROTData* iface)
{
ICOM_THIS_From_IROTData(IMoniker, iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
return FileMonikerImpl_Release(This);
}
......@@ -1292,7 +1292,7 @@ HRESULT WINAPI FileMonikerROTDataImpl_GetComparaisonData(IROTData* iface,
ULONG cbMax,
ULONG* pcbData)
{
FIXME(ole,"(),stub!\n");
FIXME("(),stub!\n");
return E_NOTIMPL;
}
......@@ -1302,7 +1302,7 @@ HRESULT WINAPI FileMonikerROTDataImpl_GetComparaisonData(IROTData* iface,
HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName,LPMONIKER* ppmk)
{
FIXME(ole,"(%s,%p),stub!\n",lpszPathName,ppmk);
FIXME("(%s,%p),stub!\n",lpszPathName,ppmk);
return E_NOTIMPL;
}
......@@ -1315,7 +1315,7 @@ HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER * ppmk)
HRESULT hr = E_FAIL;
IID riid=IID_IMoniker;
TRACE(ole,"(%p,%p)\n",lpszPathName,ppmk);
TRACE("(%p,%p)\n",lpszPathName,ppmk);
if (ppmk==NULL)
return E_POINTER;
......
ole/hglobalstream.c
View file @ 359f497e
......@@ -13,7 +13,7 @@
#include "winbase.h"
#include "winerror.h"
#include "debug.h"
#include "debugtools.h"
#include "objbase.h"
......@@ -279,7 +279,7 @@ HGLOBALStreamImpl* HGLOBALStreamImpl_Construct(
*/
void HGLOBALStreamImpl_Destroy(HGLOBALStreamImpl* This)
{
TRACE(storage, "(%p)\n", This);
TRACE("(%p)\n", This);
/*
* Release the HGlobal if the constructor asked for that.
......@@ -406,7 +406,7 @@ HRESULT WINAPI HGLOBALStreamImpl_Read(
ULONG bytesReadBuffer;
ULONG bytesToReadFromBuffer;
TRACE(storage, "(%p, %p, %ld, %p)\n", iface,
TRACE("(%p, %p, %ld, %p)\n", iface,
pv, cb, pcbRead);
/*
......@@ -477,7 +477,7 @@ HRESULT WINAPI HGLOBALStreamImpl_Write(
ULARGE_INTEGER newSize;
ULONG bytesWritten = 0;
TRACE(storage, "(%p, %p, %ld, %p)\n", iface,
TRACE("(%p, %p, %ld, %p)\n", iface,
pv, cb, pcbWritten);
/*
......@@ -549,7 +549,7 @@ HRESULT WINAPI HGLOBALStreamImpl_Seek(
ULARGE_INTEGER newPosition;
TRACE(storage, "(%p, %ld, %ld, %p)\n", iface,
TRACE("(%p, %ld, %ld, %p)\n", iface,
dlibMove.LowPart, dwOrigin, plibNewPosition);
/*
......@@ -625,7 +625,7 @@ HRESULT WINAPI HGLOBALStreamImpl_SetSize(
{
HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
TRACE(storage, "(%p, %ld)\n", iface, libNewSize.LowPart);
TRACE("(%p, %ld)\n", iface, libNewSize.LowPart);
/*
* As documented.
......@@ -668,7 +668,7 @@ HRESULT WINAPI HGLOBALStreamImpl_CopyTo(
ULARGE_INTEGER totalBytesRead;
ULARGE_INTEGER totalBytesWritten;
TRACE(storage, "(%p, %p, %ld, %p, %p)\n", iface, pstm,
TRACE("(%p, %p, %ld, %p, %p)\n", iface, pstm,
cb.LowPart, pcbRead, pcbWritten);
/*
......@@ -823,6 +823,6 @@ HRESULT WINAPI HGLOBALStreamImpl_Clone(
IStream* iface,
IStream** ppstm) /* [out] */
{
FIXME(storage, "not implemented!\n");
FIXME("not implemented!\n");
return E_NOTIMPL;
}
ole/ifs.c
View file @ 359f497e
......@@ -15,7 +15,7 @@
#include "wine/obj_base.h"
#include "local.h"
#include "module.h"
#include "debug.h"
#include "debugtools.h"
#include "ifs.h"
......@@ -35,7 +35,7 @@ typedef struct
*/
static ULONG WINAPI IUnknown_fnAddRef(LPUNKNOWN iface) {
ICOM_THIS(IUnknownImpl,iface);
TRACE(relay,"(%p)->AddRef()\n",This);
TRACE("(%p)->AddRef()\n",This);
return ++(This->ref);
}
......@@ -44,7 +44,7 @@ static ULONG WINAPI IUnknown_fnAddRef(LPUNKNOWN iface) {
*/
static ULONG WINAPI IUnknown_fnRelease(LPUNKNOWN iface) {
ICOM_THIS(IUnknownImpl,iface);
TRACE(relay,"(%p)->Release()\n",This);
TRACE("(%p)->Release()\n",This);
if (!--(This->ref)) {
HeapFree(GetProcessHeap(),0,This);
return 0;
......@@ -60,7 +60,7 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(LPUNKNOWN iface,REFIID refiid,LP
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
TRACE(relay,"(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
TRACE("(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) {
*obj = This;
......@@ -114,7 +114,7 @@ HRESULT WINAPI IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
TRACE(relay,"(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
TRACE("(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
!memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
) {
......@@ -129,7 +129,7 @@ HRESULT WINAPI IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID
*/
ULONG WINAPI IMalloc16_fnAddRef(IMalloc16* iface) {
ICOM_THIS(IMalloc16Impl,iface);
TRACE(relay,"(%p)->AddRef()\n",This);
TRACE("(%p)->AddRef()\n",This);
return 1; /* cannot be freed */
}
......@@ -138,7 +138,7 @@ ULONG WINAPI IMalloc16_fnAddRef(IMalloc16* iface) {
*/
ULONG WINAPI IMalloc16_fnRelease(IMalloc16* iface) {
ICOM_THIS(IMalloc16Impl,iface);
TRACE(relay,"(%p)->Release()\n",This);
TRACE("(%p)->Release()\n",This);
return 1; /* cannot be freed */
}
......@@ -147,7 +147,7 @@ ULONG WINAPI IMalloc16_fnRelease(IMalloc16* iface) {
*/
LPVOID WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
ICOM_THIS(IMalloc16Impl,iface);
TRACE(relay,"(%p)->Alloc(%ld)\n",This,cb);
TRACE("(%p)->Alloc(%ld)\n",This,cb);
return (LPVOID)PTR_SEG_OFF_TO_SEGPTR(This->heap,LOCAL_Alloc(This->heap,0,cb));
}
......@@ -156,7 +156,7 @@ LPVOID WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
*/
LPVOID WINAPI IMalloc16_fnRealloc(IMalloc16* iface,LPVOID pv,DWORD cb) {
ICOM_THIS(IMalloc16Impl,iface);
TRACE(relay,"(%p)->Realloc(%p,%ld)\n",This,pv,cb);
TRACE("(%p)->Realloc(%p,%ld)\n",This,pv,cb);
return (LPVOID)PTR_SEG_OFF_TO_SEGPTR(This->heap,LOCAL_ReAlloc(This->heap,0,LOWORD(pv),cb));
}
......@@ -165,7 +165,7 @@ LPVOID WINAPI IMalloc16_fnRealloc(IMalloc16* iface,LPVOID pv,DWORD cb) {
*/
VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,LPVOID pv) {
ICOM_THIS(IMalloc16Impl,iface);
TRACE(relay,"(%p)->Free(%p)\n",This,pv);
TRACE("(%p)->Free(%p)\n",This,pv);
LOCAL_Free(This->heap,LOWORD(pv));
}
......@@ -174,7 +174,7 @@ VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,LPVOID pv) {
*/
DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,LPVOID pv) {
ICOM_CTHIS(IMalloc16Impl,iface);
TRACE(relay,"(%p)->GetSize(%p)\n",This,pv);
TRACE("(%p)->GetSize(%p)\n",This,pv);
return LOCAL_Size(This->heap,LOWORD(pv));
}
......@@ -183,7 +183,7 @@ DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,LPVOID pv) {
*/
INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) {
ICOM_CTHIS(IMalloc16,iface);
TRACE(relay,"(%p)->DidAlloc(%p)\n",This,pv);
TRACE("(%p)->DidAlloc(%p)\n",This,pv);
return (INT16)-1;
}
......@@ -192,7 +192,7 @@ INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) {
*/
LPVOID WINAPI IMalloc16_fnHeapMinimize(IMalloc16* iface) {
ICOM_THIS(IMalloc16Impl,iface);
TRACE(relay,"(%p)->HeapMinimize()\n",This);
TRACE("(%p)->HeapMinimize()\n",This);
return NULL;
}
......@@ -248,7 +248,7 @@ static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVO
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
TRACE(relay,"(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
TRACE("(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
!memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
) {
......@@ -263,7 +263,7 @@ static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVO
*/
static ULONG WINAPI IMalloc_fnAddRef(LPMALLOC iface) {
ICOM_THIS(IMalloc32Impl,iface);
TRACE(relay,"(%p)->AddRef()\n",This);
TRACE("(%p)->AddRef()\n",This);
return 1; /* cannot be freed */
}
......@@ -272,7 +272,7 @@ static ULONG WINAPI IMalloc_fnAddRef(LPMALLOC iface) {
*/
static ULONG WINAPI IMalloc_fnRelease(LPMALLOC iface) {
ICOM_THIS(IMalloc32Impl,iface);
TRACE(relay,"(%p)->Release()\n",This);
TRACE("(%p)->Release()\n",This);
return 1; /* cannot be freed */
}
......@@ -281,7 +281,7 @@ static ULONG WINAPI IMalloc_fnRelease(LPMALLOC iface) {
*/
static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface,DWORD cb) {
ICOM_THIS(IMalloc32Impl,iface);
TRACE(relay,"(%p)->Alloc(%ld)\n",This,cb);
TRACE("(%p)->Alloc(%ld)\n",This,cb);
return HeapAlloc(GetProcessHeap(),0,cb);
}
......@@ -290,7 +290,7 @@ static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface,DWORD cb) {
*/
static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) {
ICOM_THIS(IMalloc32Impl,iface);
TRACE(relay,"(%p)->Realloc(%p,%ld)\n",This,pv,cb);
TRACE("(%p)->Realloc(%p,%ld)\n",This,pv,cb);
return HeapReAlloc(GetProcessHeap(),0,pv,cb);
}
......@@ -299,7 +299,7 @@ static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) {
*/
static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) {
ICOM_THIS(IMalloc32Impl,iface);
TRACE(relay,"(%p)->Free(%p)\n",This,pv);
TRACE("(%p)->Free(%p)\n",This,pv);
HeapFree(GetProcessHeap(),0,pv);
}
......@@ -308,7 +308,7 @@ static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) {
*/
static DWORD WINAPI IMalloc_fnGetSize(const IMalloc* iface,LPVOID pv) {
ICOM_CTHIS(IMalloc,iface);
TRACE(relay,"(%p)->GetSize(%p)\n",This,pv);
TRACE("(%p)->GetSize(%p)\n",This,pv);
return HeapSize(GetProcessHeap(),0,pv);
}
......@@ -317,7 +317,7 @@ static DWORD WINAPI IMalloc_fnGetSize(const IMalloc* iface,LPVOID pv) {
*/
static INT WINAPI IMalloc_fnDidAlloc(const IMalloc* iface,LPVOID pv) {
ICOM_CTHIS(IMalloc32Impl,iface);
TRACE(relay,"(%p)->DidAlloc(%p)\n",This,pv);
TRACE("(%p)->DidAlloc(%p)\n",This,pv);
return -1;
}
......@@ -326,7 +326,7 @@ static INT WINAPI IMalloc_fnDidAlloc(const IMalloc* iface,LPVOID pv) {
*/
static LPVOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) {
ICOM_THIS(IMalloc32Impl,iface);
TRACE(relay,"(%p)->HeapMinimize()\n",This);
TRACE("(%p)->HeapMinimize()\n",This);
return NULL;
}
......
ole/itemmoniker.c
View file @ 359f497e
......@@ -6,7 +6,7 @@
#include <assert.h>
#include "winerror.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
......@@ -132,7 +132,7 @@ HRESULT WINAPI ItemMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void**
{
ICOM_THIS(ItemMonikerImpl,iface);
TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
......@@ -169,7 +169,7 @@ ULONG WINAPI ItemMonikerImpl_AddRef(IMoniker* iface)
{
ICOM_THIS(ItemMonikerImpl,iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
return ++(This->ref);
}
......@@ -181,7 +181,7 @@ ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface)
{
ICOM_THIS(ItemMonikerImpl,iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
This->ref--;
......@@ -200,7 +200,7 @@ ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface)
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_GetClassID(const IMoniker* iface,CLSID *pClassID)
{
TRACE(ole,"(%p,%p),stub!\n",iface,pClassID);
TRACE("(%p,%p),stub!\n",iface,pClassID);
if (pClassID==NULL)
return E_POINTER;
......@@ -219,7 +219,7 @@ HRESULT WINAPI ItemMonikerImpl_IsDirty(IMoniker* iface)
method in the OLE-provided moniker interfaces always return S_FALSE because
their internal state never changes. */
TRACE(ole,"(%p)\n",iface);
TRACE("(%p)\n",iface);
return S_FALSE;
}
......@@ -316,7 +316,7 @@ HRESULT WINAPI ItemMonikerImpl_GetSizeMax(IMoniker* iface,
DWORD delimiterLength=lstrlenW(This->itemDelimiter)+1;
DWORD nameLength=lstrlenW(This->itemName)+1;
TRACE(ole,"(%p,%p)\n",iface,pcbSize);
TRACE("(%p,%p)\n",iface,pcbSize);
if (pcbSize!=NULL)
return E_POINTER;
......@@ -343,7 +343,7 @@ HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR lpszDe
int sizeStr1=lstrlenW(lpszItem);
int sizeStr2=lstrlenW(lpszDelim);
TRACE(ole,"(%p,%p)\n",This,lpszItem);
TRACE("(%p,%p)\n",This,lpszItem);
/* Initialize the virtual fgunction table. */
This->lpvtbl1 = &VT_ItemMonikerImpl;
......@@ -367,7 +367,7 @@ HRESULT WINAPI ItemMonikerImpl_Construct(ItemMonikerImpl* This, LPCOLESTR lpszDe
*******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* This)
{
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
if (This->itemName)
HeapFree(GetProcessHeap(),0,This->itemName);
......@@ -395,7 +395,7 @@ HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface,
IID refid=IID_IOleItemContainer;
IOleItemContainer *poic=0;
TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
if(ppvResult ==NULL)
return E_POINTER;
......@@ -431,7 +431,7 @@ HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker* iface,
HRESULT res;
IOleItemContainer *poic=0;
TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
*ppvResult=0;
......@@ -459,7 +459,7 @@ HRESULT WINAPI ItemMonikerImpl_Reduce(IMoniker* iface,
IMoniker** ppmkToLeft,
IMoniker** ppmkReduced)
{
TRACE(ole,"(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
......@@ -484,7 +484,7 @@ HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface,
IMoniker *pmostLeftMk=0;
IMoniker* tempMkComposite=0;
TRACE(ole,"(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
if ((ppmkComposite==NULL)||(pmkRight==NULL))
return E_POINTER;
......@@ -550,7 +550,7 @@ HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface,
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker)
{
TRACE(ole,"(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
if (ppenumMoniker == NULL)
return E_POINTER;
......@@ -571,7 +571,7 @@ HRESULT WINAPI ItemMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker
IBindCtx* bind;
HRESULT res;
TRACE(ole,"(%p,%p)\n",iface,pmkOtherMoniker);
TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
if (pmkOtherMoniker==NULL)
return S_FALSE;
......@@ -644,7 +644,7 @@ HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker* iface,
IOleItemContainer *poic=0;
ICOM_THIS(ItemMonikerImpl,iface);
TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
/* If pmkToLeft is NULL, this method returns TRUE if pmkNewlyRunning is non-NULL and is equal to this */
/* moniker. Otherwise, the method checks the ROT to see whether this moniker is running. */
......@@ -695,7 +695,7 @@ HRESULT WINAPI ItemMonikerImpl_GetTimeOfLastChange(IMoniker* iface,
HRESULT res;
IMoniker *compositeMk;
TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pItemTime);
TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pItemTime);
if (pItemTime==NULL)
return E_INVALIDARG;
......@@ -729,7 +729,7 @@ HRESULT WINAPI ItemMonikerImpl_GetTimeOfLastChange(IMoniker* iface,
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk)
{
TRACE(ole,"(%p,%p)\n",iface,ppmk);
TRACE("(%p,%p)\n",iface,ppmk);
if (ppmk==NULL)
return E_POINTER;
......@@ -766,7 +766,7 @@ HRESULT WINAPI ItemMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOth
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath)
{
TRACE(ole,"(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
if (ppmkRelPath==NULL)
return E_POINTER;
......@@ -786,7 +786,7 @@ HRESULT WINAPI ItemMonikerImpl_GetDisplayName(IMoniker* iface,
{
ICOM_THIS(ItemMonikerImpl,iface);
TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
if (ppszDisplayName==NULL)
return E_POINTER;
......@@ -852,7 +852,7 @@ HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker* iface,
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
{
TRACE(ole,"(%p,%p)\n",iface,pwdMksys);
TRACE("(%p,%p)\n",iface,pwdMksys);
if (!pwdMksys)
return E_POINTER;
......@@ -870,7 +870,7 @@ HRESULT WINAPI ItemMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid
ICOM_THIS_From_IROTData(IMoniker, iface);
TRACE(ole,"(%p,%p,%p)\n",iface,riid,ppvObject);
TRACE("(%p,%p,%p)\n",iface,riid,ppvObject);
return ItemMonikerImpl_QueryInterface(This, riid, ppvObject);
}
......@@ -882,7 +882,7 @@ ULONG WINAPI ItemMonikerROTDataImpl_AddRef(IROTData *iface)
{
ICOM_THIS_From_IROTData(IMoniker, iface);
TRACE(ole,"(%p)\n",iface);
TRACE("(%p)\n",iface);
return ItemMonikerImpl_AddRef(This);
}
......@@ -894,7 +894,7 @@ ULONG WINAPI ItemMonikerROTDataImpl_Release(IROTData* iface)
{
ICOM_THIS_From_IROTData(IMoniker, iface);
TRACE(ole,"(%p)\n",iface);
TRACE("(%p)\n",iface);
return ItemMonikerImpl_Release(This);
}
......@@ -907,7 +907,7 @@ HRESULT WINAPI ItemMonikerROTDataImpl_GetComparaisonData(IROTData* iface,
ULONG cbMax,
ULONG* pcbData)
{
FIXME(ole,"(),stub!\n");
FIXME("(),stub!\n");
return E_NOTIMPL;
}
......@@ -917,7 +917,7 @@ HRESULT WINAPI ItemMonikerROTDataImpl_GetComparaisonData(IROTData* iface,
HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim,LPCOLESTR lpszItem,LPMONIKER* ppmk)
{
FIXME(ole,"(%s,%p),stub!\n",lpszDelim,ppmk);
FIXME("(%s,%p),stub!\n",lpszDelim,ppmk);
*ppmk = NULL;
return E_NOTIMPL;
}
......@@ -931,7 +931,7 @@ HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim,LPCOLESTR lpszItem, LPMONI
HRESULT hr = S_OK;
IID riid=IID_IMoniker;
TRACE(ole,"(%p,%p,%p)\n",lpszDelim,lpszItem,ppmk);
TRACE("(%p,%p,%p)\n",lpszDelim,lpszItem,ppmk);
newItemMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(ItemMonikerImpl));
......
ole/memlockbytes.c
View file @ 359f497e
......@@ -11,7 +11,7 @@
#include "winerror.h"
#include "objbase.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......
ole/moniker.c
View file @ 359f497e
......@@ -8,7 +8,7 @@
#include <assert.h>
#include "winerror.h"
#include "wine/obj_moniker.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -82,7 +82,7 @@ HRESULT WINAPI RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface,
{
ICOM_THIS(RunningObjectTableImpl,iface);
TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* validate arguments*/
if (This==0)
......@@ -114,7 +114,7 @@ ULONG WINAPI RunningObjectTableImpl_AddRef(IRunningObjectTable* iface)
{
ICOM_THIS(RunningObjectTableImpl,iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
return ++(This->ref);
}
......@@ -124,7 +124,7 @@ ULONG WINAPI RunningObjectTableImpl_AddRef(IRunningObjectTable* iface)
*/
HRESULT WINAPI RunningObjectTableImpl_Destroy()
{
TRACE(ole,"()\n");
TRACE("()\n");
if (runningObjectTableInstance==NULL)
return E_INVALIDARG;
......@@ -146,7 +146,7 @@ ULONG WINAPI RunningObjectTableImpl_Release(IRunningObjectTable* iface)
DWORD i;
ICOM_THIS(RunningObjectTableImpl,iface);
TRACE(ole,"(%p)\n",This);
TRACE("(%p)\n",This);
This->ref--;
......@@ -180,7 +180,7 @@ ULONG WINAPI RunningObjectTableImpl_Release(IRunningObjectTable* iface)
*/
HRESULT WINAPI RunningObjectTableImpl_Initialize()
{
TRACE(ole,"()\n");
TRACE("()\n");
/* create the unique instance of the RunningObjectTableImpl structure */
runningObjectTableInstance = HeapAlloc(GetProcessHeap(), 0, sizeof(RunningObjectTableImpl));
......@@ -214,7 +214,7 @@ HRESULT WINAPI RunningObjectTableImpl_Initialize()
*/
HRESULT WINAPI RunningObjectTableImpl_UnInitialize()
{
TRACE(ole,"()\n");
TRACE("()\n");
if (runningObjectTableInstance==NULL)
return E_POINTER;
......@@ -238,7 +238,7 @@ HRESULT WINAPI RunningObjectTableImpl_Register(IRunningObjectTable* iface,
HRESULT res=S_OK;
ICOM_THIS(RunningObjectTableImpl,iface);
TRACE(ole,"(%p,%ld,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister);
TRACE("(%p,%ld,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister);
/* there's only tow types of register : strong and or weak registration (only one must be passed on parameter) */
if ( ( (grfFlags & ROTFLAGS_REGISTRATIONKEEPSALIVE) || !(grfFlags & ROTFLAGS_ALLOWANYCLIENT)) &&
......@@ -265,7 +265,7 @@ HRESULT WINAPI RunningObjectTableImpl_Register(IRunningObjectTable* iface,
if (This->runObjTabRegister == 0xFFFFFFFF){
FIXME(ole,"runObjTabRegister: %ld is out of data limite \n",This->runObjTabRegister);
FIXME("runObjTabRegister: %ld is out of data limite \n",This->runObjTabRegister);
return E_FAIL;
}
This->runObjTabRegister++;
......@@ -298,7 +298,7 @@ HRESULT WINAPI RunningObjectTableImpl_Revoke( IRunningObjectTable* iface,
DWORD index,j;
ICOM_THIS(RunningObjectTableImpl,iface);
TRACE(ole,"(%p,%ld)\n",This,dwRegister);
TRACE("(%p,%ld)\n",This,dwRegister);
/* verify if the object to be revoked was registred befor or not */
if (RunningObjectTableImpl_GetObjectIndex(This,dwRegister,NULL,&index)==S_FALSE)
......@@ -328,7 +328,7 @@ HRESULT WINAPI RunningObjectTableImpl_IsRunning( IRunningObjectTable* iface,
{
ICOM_THIS(RunningObjectTableImpl,iface);
TRACE(ole,"(%p,%p)\n",This,pmkObjectName);
TRACE("(%p,%p)\n",This,pmkObjectName);
return RunningObjectTableImpl_GetObjectIndex(This,-1,pmkObjectName,NULL);
}
......@@ -343,7 +343,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetObject( IRunningObjectTable* iface,
DWORD index;
ICOM_THIS(RunningObjectTableImpl,iface);
TRACE(ole,"(%p,%p,%p)\n",This,pmkObjectName,ppunkObject);
TRACE("(%p,%p,%p)\n",This,pmkObjectName,ppunkObject);
if (ppunkObject==NULL)
return E_POINTER;
......@@ -371,7 +371,7 @@ HRESULT WINAPI RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface,
DWORD index=-1;
ICOM_THIS(RunningObjectTableImpl,iface);
TRACE(ole,"(%p,%ld,%p)\n",This,dwRegister,pfiletime);
TRACE("(%p,%ld,%p)\n",This,dwRegister,pfiletime);
/* verify if the object to be changed was registred befor or not */
if (RunningObjectTableImpl_GetObjectIndex(This,dwRegister,NULL,&index)==S_FALSE)
......@@ -393,7 +393,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* i
DWORD index=-1;
ICOM_THIS(RunningObjectTableImpl,iface);
TRACE(ole,"(%p,%p,%p)\n",This,pmkObjectName,pfiletime);
TRACE("(%p,%p,%p)\n",This,pmkObjectName,pfiletime);
if (pmkObjectName==NULL || pfiletime==NULL)
return E_INVALIDARG;
......@@ -413,7 +413,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* i
HRESULT WINAPI RunningObjectTableImpl_EnumRunning(IRunningObjectTable* iface,
IEnumMoniker **ppenumMoniker) /* Address of output variable that receives the IEnumMoniker interface pointer */
{
FIXME(ole,"(%p,%p) needs the IEnumMoniker implementation \n",iface,ppenumMoniker);
FIXME("(%p,%p) needs the IEnumMoniker implementation \n",iface,ppenumMoniker);
return E_NOTIMPL;
}
......@@ -428,7 +428,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetObjectIndex(RunningObjectTableImpl* Thi
DWORD i;
TRACE(ole,"(%p,%ld,%p,%p)\n",This,identReg,pmk,indx);
TRACE("(%p,%ld,%p,%p)\n",This,identReg,pmk,indx);
if (pmk!=NULL)
/* search object identified by a moniker*/
......@@ -449,7 +449,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetObjectIndex(RunningObjectTableImpl* Thi
*/
HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
{
FIXME(ole,"(%ld,%p),stub!\n",reserved,pprot);
FIXME("(%ld,%p),stub!\n",reserved,pprot);
return E_NOTIMPL;
}
......@@ -461,7 +461,7 @@ HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot
IID riid=IID_IRunningObjectTable;
HRESULT res;
TRACE(ole,"()\n");
TRACE("()\n");
if (reserved!=0)
return E_UNEXPECTED;
......
ole/ole2.c
View file @ 359f497e
......@@ -18,7 +18,7 @@
#include "commctrl.h"
#include "wine/obj_clientserver.h"
#include "wine/wingdi16.h"
#include "debug.h"
#include "debugtools.h"
#include "ole2ver.h"
#include "winreg.h"
......@@ -138,7 +138,7 @@ static DWORD OLEDD_GetButtonState();
*/
DWORD WINAPI OleBuildVersion(void)
{
TRACE(ole,"(void)\n");
TRACE("(void)\n");
return (rmm<<16)+rup;
}
......@@ -149,7 +149,7 @@ HRESULT WINAPI OleInitialize(LPVOID reserved)
{
HRESULT hr;
TRACE(ole, "(%p)\n", reserved);
TRACE("(%p)\n", reserved);
/*
* The first duty of the OleInitialize is to initialize the COM libraries.
......@@ -176,7 +176,7 @@ HRESULT WINAPI OleInitialize(LPVOID reserved)
/*
* Initialize the libraries.
*/
TRACE(ole, "() - Initializing the OLE libraries\n");
TRACE("() - Initializing the OLE libraries\n");
/*
* Drag and Drop
......@@ -212,7 +212,7 @@ DWORD WINAPI CoGetCurrentProcess(void) {
*/
void WINAPI OleUninitialize(void)
{
TRACE(ole, "()\n");
TRACE("()\n");
/*
* Decrease the lock count on the OLE module.
......@@ -227,7 +227,7 @@ void WINAPI OleUninitialize(void)
/*
* Actually free the libraries.
*/
TRACE(ole, "() - Freeing the last reference count\n");
TRACE("() - Freeing the last reference count\n");
/*
* Drag and Drop
......@@ -259,7 +259,7 @@ HRESULT WINAPI OleFlushClipboard16(void)
*/
HRESULT WINAPI OleSetClipboard(LPVOID pDataObj)
{
FIXME(ole,"(%p), stub!\n", pDataObj);
FIXME("(%p), stub!\n", pDataObj);
return S_OK;
}
......@@ -270,7 +270,7 @@ HRESULT WINAPI CoRegisterMessageFilter(
LPMESSAGEFILTER lpMessageFilter, /* Pointer to interface */
LPMESSAGEFILTER *lplpMessageFilter /* Indirect pointer to prior instance if non-NULL */
) {
FIXME(ole,"stub\n");
FIXME("stub\n");
if (lplpMessageFilter) {
*lplpMessageFilter = NULL;
}
......@@ -281,7 +281,7 @@ HRESULT WINAPI CoRegisterMessageFilter(
* OleInitializeWOW [OLE32.109]
*/
HRESULT WINAPI OleInitializeWOW(DWORD x) {
FIXME(ole,"(0x%08lx),stub!\n",x);
FIXME("(0x%08lx),stub!\n",x);
return 0;
}
......@@ -292,7 +292,7 @@ HRESULT WINAPI RegisterDragDrop16(
HWND16 hwnd,
LPDROPTARGET pDropTarget
) {
FIXME(ole,"(0x%04x,%p),stub!\n",hwnd,pDropTarget);
FIXME("(0x%04x,%p),stub!\n",hwnd,pDropTarget);
return S_OK;
}
......@@ -305,7 +305,7 @@ HRESULT WINAPI RegisterDragDrop(
{
DropTargetNode* dropTargetInfo;
TRACE(ole,"(0x%x,%p)\n", hwnd, pDropTarget);
TRACE("(0x%x,%p)\n", hwnd, pDropTarget);
/*
* First, check if the window is already registered.
......@@ -345,7 +345,7 @@ HRESULT WINAPI RegisterDragDrop(
HRESULT WINAPI RevokeDragDrop16(
HWND16 hwnd
) {
FIXME(ole,"(0x%04x),stub!\n",hwnd);
FIXME("(0x%04x),stub!\n",hwnd);
return S_OK;
}
......@@ -357,7 +357,7 @@ HRESULT WINAPI RevokeDragDrop(
{
DropTargetNode* dropTargetInfo;
TRACE(ole,"(0x%x)\n", hwnd);
TRACE("(0x%x)\n", hwnd);
/*
* First, check if the window is already registered.
......@@ -414,7 +414,7 @@ HRESULT WINAPI OleRegGetUserType(
strcat(keyName, xclsid);
strcat(keyName, "\\");
TRACE(ole,"(%s, %ld, %p)\n", keyName, dwFormOfType, pszUserType);
TRACE("(%s, %ld, %p)\n", keyName, dwFormOfType, pszUserType);
/*
* Open the class id Key
......@@ -488,7 +488,7 @@ HRESULT WINAPI DoDragDrop (
HWND hwndTrackWindow;
MSG msg;
TRACE(ole,"(DataObject %p, DropSource %p)\n", pDataObject, pDropSource);
TRACE("(DataObject %p, DropSource %p)\n", pDataObject, pDropSource);
/*
* Setup the drag n drop tracking window.
......@@ -572,7 +572,7 @@ HRESULT WINAPI DoDragDrop (
HRESULT WINAPI OleQueryLinkFromData(
IDataObject* pSrcDataObject)
{
FIXME(ole,"(%p),stub!\n", pSrcDataObject);
FIXME("(%p),stub!\n", pSrcDataObject);
return S_OK;
}
......@@ -605,7 +605,7 @@ HRESULT WINAPI OleRegGetMiscStatus(
strcat(keyName, xclsid);
strcat(keyName, "\\");
TRACE(ole,"(%s, %ld, %p)\n", keyName, dwAspect, pdwStatus);
TRACE("(%s, %ld, %p)\n", keyName, dwAspect, pdwStatus);
/*
* Open the class id Key
......@@ -670,7 +670,7 @@ HRESULT WINAPI OleSetContainedObject(
IRunnableObject* runnable = NULL;
HRESULT hres;
TRACE(ole,"(%p,%x), stub!\n", pUnknown, fContained);
TRACE("(%p,%x), stub!\n", pUnknown, fContained);
hres = IUnknown_QueryInterface(pUnknown,
&IID_IRunnableObject,
......@@ -702,7 +702,7 @@ HRESULT WINAPI OleLoad(
STATSTG storageInfo;
HRESULT hres;
TRACE(ole,"(%p,%p,%p,%p)\n", pStg, riid, pClientSite, ppvObj);
TRACE("(%p,%p,%p,%p)\n", pStg, riid, pClientSite, ppvObj);
/*
* TODO, Conversion ... OleDoAutoConvert
......@@ -784,7 +784,7 @@ HRESULT WINAPI OleSave(
HRESULT hres;
CLSID objectClass;
TRACE(ole,"(%p,%p,%x)\n", pPS, pStg, fSameAsLoad);
TRACE("(%p,%p,%x)\n", pPS, pStg, fSameAsLoad);
/*
* First, we transfer the class ID (if available)
......@@ -818,7 +818,7 @@ HRESULT WINAPI OleSave(
HRESULT WINAPI OleGetClipboard(
IDataObject** ppDataObj)
{
FIXME(ole,"(%p),stub!\n", ppDataObj);
FIXME("(%p),stub!\n", ppDataObj);
if (ppDataObj)
*ppDataObj=0;
......@@ -1091,7 +1091,7 @@ LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lParam)
OleMenuHookItem *pHookItem = NULL;
WORD fuFlags;
TRACE(ole,"%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
TRACE("%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
/* Check if we're being asked to process the message */
if ( HC_ACTION != code )
......@@ -1175,7 +1175,7 @@ NEXTHOOK:
if ( !( pHookItem = OLEMenu_IsHookInstalled( GetCurrentThreadId(), NULL ) ) )
{
/* This should never fail!! */
WARN(ole, "could not retrieve hHook for current thread!\n" );
WARN("could not retrieve hHook for current thread!\n" );
return 0;
}
......@@ -1196,7 +1196,7 @@ LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lParam)
OleMenuHookItem *pHookItem = NULL;
WORD wCode;
TRACE(ole,"%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
TRACE("%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
/* Check if we're being asked to process a messages */
if ( HC_ACTION != code )
......@@ -1249,7 +1249,7 @@ NEXTHOOK:
if ( !( pHookItem = OLEMenu_IsHookInstalled( GetCurrentThreadId(), NULL ) ) )
{
/* This should never fail!! */
WARN(ole, "could not retrieve hHook for current thread!\n" );
WARN("could not retrieve hHook for current thread!\n" );
return FALSE;
}
......@@ -1343,7 +1343,7 @@ HRESULT WINAPI OleSetMenuDescriptor(
if ( lpFrame || lpActiveObject )
{
FIXME(ole,"(%x, %x, %x, %p, %p), Context sensitive help filtering not implemented!\n",
FIXME("(%x, %x, %x, %p, %p), Context sensitive help filtering not implemented!\n",
(unsigned int)hOleMenu,
hwndFrame,
hwndActiveObject,
......@@ -2120,7 +2120,7 @@ HGLOBAL16 WINAPI OleMetaFilePictFromIconAndLabel16(
HGLOBAL16 hmf;
HDC16 hdc;
FIXME(ole, "(%04x, '%s', '%s', %d): incorrect metrics, please try to correct them !\n\n\n", hIcon, lpszLabel, lpszSourceFile, iIconIndex);
FIXME("(%04x, '%s', '%s', %d): incorrect metrics, please try to correct them !\n\n\n", hIcon, lpszLabel, lpszSourceFile, iIconIndex);
if (!hIcon) {
if (lpszSourceFile) {
......
ole/ole2disp.c
View file @ 359f497e
......@@ -11,7 +11,7 @@
#include "wine/obj_base.h"
#include "heap.h"
#include "ldt.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -300,7 +300,7 @@ HRESULT WINAPI CreateDispTypeInfo16(
LCID lcid,
ITypeInfo **pptinfo
) {
FIXME(ole,"(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
return 0;
}
......@@ -312,7 +312,7 @@ HRESULT WINAPI RegisterActiveObject16(
) {
char buf[80];
WINE_StringFromCLSID(rclsid,buf);
FIXME(ole,"(%p,%s,0x%08lx,%p):stub\n",punk,buf,dwFlags,pdwRegister);
FIXME("(%p,%s,0x%08lx,%p):stub\n",punk,buf,dwFlags,pdwRegister);
return 0;
}
......@@ -332,7 +332,7 @@ INT WINAPI OleTranslateColor(
COLORREF colorref;
BYTE b = HIBYTE(HIWORD(clr));
TRACE(ole,"(%08lx, %d, %p):stub\n", clr, hpal, pColorRef);
TRACE("(%08lx, %d, %p):stub\n", clr, hpal, pColorRef);
/*
* In case pColorRef is NULL, provide our own to simplify the code.
......
ole/ole2stubs.c
View file @ 359f497e
......@@ -5,7 +5,7 @@
*/
#include "ole2.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -17,7 +17,7 @@ HRESULT WINAPI OleCreateFromData(LPDATAOBJECT pSrcDataObj, REFIID riid,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg,
LPVOID* ppvObj)
{
FIXME(ole,"(%p,%p,%li,%p,%p,%p,%p), stub!\n", pSrcDataObj,riid,renderopt,pFormatEtc,pClientSite,pStg,ppvObj);
FIXME("(%p,%p,%li,%p,%p,%p,%p), stub!\n", pSrcDataObj,riid,renderopt,pFormatEtc,pClientSite,pStg,ppvObj);
return S_OK;
}
......@@ -29,7 +29,7 @@ HRESULT WINAPI OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid,
DWORD renderopt, LPFORMATETC lpFormatEtc,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
{
FIXME(ole,"(%p,%p,%li,%p,%p,%p,%p), stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj);
FIXME("(%p,%p,%li,%p,%p,%p,%p), stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj);
return S_OK;
}
......@@ -40,7 +40,7 @@ HRESULT WINAPI OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid,
HRESULT WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat,
UINT uiFlags)
{
FIXME(ole,"(%x,%x,%x), stub!\n", hSrc, cfFormat, uiFlags);
FIXME("(%x,%x,%x), stub!\n", hSrc, cfFormat, uiFlags);
return S_OK;
}
......@@ -51,7 +51,7 @@ HRESULT WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat,
HRESULT WINAPI WriteFmtUserTypeStg(
LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR lpszUserType)
{
FIXME(ole,"(%p,%x,%p) stub!\n",pstg,cf,lpszUserType);
FIXME("(%p,%x,%p) stub!\n",pstg,cf,lpszUserType);
return S_OK;
}
......@@ -61,7 +61,7 @@ HRESULT WINAPI WriteFmtUserTypeStg(
HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame,
LPOLEINPLACEFRAMEINFO lpFrameInfo, LPMSG lpmsg)
{
FIXME(ole,"(%p,%p,%p),stub!\n", lpFrame, lpFrameInfo, lpmsg);
FIXME("(%p,%p,%p),stub!\n", lpFrame, lpFrameInfo, lpmsg);
return S_OK;
}
......@@ -70,7 +70,7 @@ HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame,
*/
HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
{
FIXME(ole,"(%p,%p), stub!\n", clsidOld, clsidNew);
FIXME("(%p,%p), stub!\n", clsidOld, clsidNew);
return S_OK;
}
......@@ -80,7 +80,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
*/
BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* lpwCmd)
{
FIXME(ole,"(%x,%i,%p,%p), stub!\n", hAccel, cAccelEntries, lpMsg, lpwCmd);
FIXME("(%x,%i,%p,%p), stub!\n", hAccel, cAccelEntries, lpMsg, lpwCmd);
return TRUE;
}
......@@ -89,7 +89,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
*/
HRESULT WINAPI SetConvertStg(LPSTORAGE pStg, BOOL fConvert)
{
FIXME(ole,"(%p,%x), stub!\n", pStg, fConvert);
FIXME("(%p,%x), stub!\n", pStg, fConvert);
return S_OK;
}
......@@ -98,7 +98,7 @@ HRESULT WINAPI SetConvertStg(LPSTORAGE pStg, BOOL fConvert)
*/
HRESULT WINAPI OleFlushClipboard()
{
FIXME(ole,"(), stub!\n");
FIXME("(), stub!\n");
return S_OK;
}
......@@ -108,7 +108,7 @@ HRESULT WINAPI OleFlushClipboard()
HRESULT WINAPI OleCreate(REFCLSID rclsid, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite,
LPSTORAGE pStg, LPVOID* ppvObj)
{
FIXME(ole,"(not shown), stub!\n");
FIXME("(not shown), stub!\n");
return S_OK;
}
......@@ -118,7 +118,7 @@ HRESULT WINAPI OleCreate(REFCLSID rclsid, REFIID riid, DWORD renderopt, LPFORMAT
HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
{
FIXME(ole,"(not shown), stub!\n");
FIXME("(not shown), stub!\n");
return S_OK;
}
......@@ -128,7 +128,7 @@ HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt,
HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID riid,
DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
{
FIXME(ole,"(not shown), stub!\n");
FIXME("(not shown), stub!\n");
return S_OK;
}
......@@ -137,7 +137,7 @@ HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID
*/
HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCloses)
{
FIXME(ole,"(%p,%x,%x), stub!\n", pUnknown, fLock, fLastUnlockCloses);
FIXME("(%p,%x,%x), stub!\n", pUnknown, fLock, fLastUnlockCloses);
return S_OK;
}
......@@ -146,7 +146,7 @@ HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCl
*/
HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseTypeAsLabel)
{
FIXME(ole,"(%p,%p,%x), stub!\n", rclsid, lpszLabel, fUseTypeAsLabel);
FIXME("(%p,%p,%x), stub!\n", rclsid, lpszLabel, fUseTypeAsLabel);
return S_OK;
}
......@@ -155,7 +155,7 @@ HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseT
*/
HRESULT WINAPI OleQueryCreateFromData(LPDATAOBJECT pSrcDataObject)
{
FIXME(ole,"(%p), stub!\n", pSrcDataObject);
FIXME("(%p), stub!\n", pSrcDataObject);
return S_OK;
}
......@@ -164,7 +164,7 @@ HRESULT WINAPI OleQueryCreateFromData(LPDATAOBJECT pSrcDataObject)
*/
HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lplpszUserType)
{
FIXME(ole,"(%p,%p,%p), stub!\n", pstg, pcf, lplpszUserType);
FIXME("(%p,%p,%p), stub!\n", pstg, pcf, lplpszUserType);
return S_OK;
}
......@@ -175,7 +175,7 @@ HRESULT WINAPI OleCreateStaticFromData(LPDATAOBJECT pSrcDataObj, REFIID iid,
DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite,
LPSTORAGE pStg, LPVOID* ppvObj)
{
FIXME(ole,"(not shown), stub!\n");
FIXME("(not shown), stub!\n");
return S_OK;
}
......@@ -184,7 +184,7 @@ HRESULT WINAPI OleCreateStaticFromData(LPDATAOBJECT pSrcDataObj, REFIID iid,
*/
HRESULT WINAPI OleRun(LPUNKNOWN pUnknown)
{
FIXME(ole,"(%p), stub!\n", pUnknown);
FIXME("(%p), stub!\n", pUnknown);
return S_OK;
}
......@@ -197,7 +197,7 @@ HRESULT WINAPI OleCreateLinkFromData(LPDATAOBJECT pSrcDataObj, REFIID riid,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg,
LPVOID* ppvObj)
{
FIXME(ole,"(not shown), stub!\n");
FIXME("(not shown), stub!\n");
return S_OK;
}
......@@ -206,7 +206,7 @@ HRESULT WINAPI OleCreateLinkFromData(LPDATAOBJECT pSrcDataObj, REFIID riid,
*/
BOOL WINAPI OleIsRunning(LPOLEOBJECT pObject)
{
FIXME(ole,"(%p), stub!\n", pObject);
FIXME("(%p), stub!\n", pObject);
return TRUE;
}
......@@ -215,7 +215,7 @@ BOOL WINAPI OleIsRunning(LPOLEOBJECT pObject)
*/
HRESULT WINAPI OleRegEnumVerbs (REFCLSID clsid, LPENUMOLEVERB* ppenum)
{
FIXME(ole,"(%p,%p), stub!\n", clsid, ppenum);
FIXME("(%p,%p), stub!\n", clsid, ppenum);
return S_OK;
}
......@@ -227,7 +227,7 @@ HRESULT WINAPI OleRegEnumFormatEtc (
DWORD dwDirection,
LPENUMFORMATETC* ppenumFormatetc)
{
FIXME(ole,"(%p, %ld, %p), stub!\n", clsid, dwDirection, ppenumFormatetc);
FIXME("(%p, %ld, %p), stub!\n", clsid, dwDirection, ppenumFormatetc);
return S_OK;
}
......
ole/olecli.c
View file @ 359f497e
......@@ -11,7 +11,7 @@
#include "ole.h"
#include "gdi.h"
#include "objidl.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -24,7 +24,7 @@ extern LONG OLE_current_handle;
OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
LONG reserved, LHCLIENTDOC *hRet )
{
FIXME(ole,"(%s,%s,...): stub\n",classname,docname);
FIXME("(%s,%s,...): stub\n",classname,docname);
*hRet=++OLE_current_handle;
return OLE_OK;
}
......@@ -35,7 +35,7 @@ OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname,
LONG reserved, LHCLIENTDOC *hRet )
{
FIXME(ole,"(%s,%s,...): stub\n",classname,docname);
FIXME("(%s,%s,...): stub\n",classname,docname);
*hRet=++OLE_current_handle;
return OLE_OK;
}
......@@ -45,7 +45,7 @@ OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname,
*/
OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
{
FIXME(ole,"(%ld,%s,...): stub\n",hDoc, newName);
FIXME("(%ld,%s,...): stub\n",hDoc, newName);
return OLE_OK;
}
......@@ -54,7 +54,7 @@ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
*/
OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName)
{
FIXME(ole,"(%ld,%s,...): stub\n",hDoc, newName);
FIXME("(%ld,%s,...): stub\n",hDoc, newName);
return OLE_OK;
}
......@@ -63,7 +63,7 @@ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName)
*/
OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
{
FIXME(ole,"(%ld): stub\n",hServerDoc);
FIXME("(%ld): stub\n",hServerDoc);
return OLE_OK;
}
......@@ -72,7 +72,7 @@ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
*/
OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc)
{
FIXME(ole,"(%ld): stub\n",hServerDoc);
FIXME("(%ld): stub\n",hServerDoc);
return OLE_OK;
}
......@@ -81,7 +81,7 @@ OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc)
*/
OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc)
{
FIXME(ole, "(%ld): stub\n", hServerDoc);
FIXME("(%ld): stub\n", hServerDoc);
return OLE_OK;
}
......@@ -90,7 +90,7 @@ OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc)
*/
OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data)
{
FIXME(ole, "(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data),
FIXME("(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data),
LOWORD(data));
return OLE_OK;
}
......@@ -102,7 +102,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip16(
LPCSTR name, LPOLECLIENT olecli, LHCLIENTDOC hclientdoc, LPCSTR xname,
LPOLEOBJECT *lpoleob, UINT16 render, UINT16 clipformat
) {
FIXME(ole, "(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
(char *)PTR_SEG_TO_LIN(name), HIWORD(olecli), LOWORD(olecli),
hclientdoc, (char *)PTR_SEG_TO_LIN(xname), HIWORD(lpoleob),
LOWORD(lpoleob), render, clipformat);
......@@ -116,7 +116,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip(
LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,
LPOLEOBJECT *lpoleob,OLEOPT_RENDER render,OLECLIPFORMAT clipformat
) {
FIXME(ole,"(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
name,olecli,hclientdoc,xname,lpoleob,render,clipformat);
return OLE_OK;
}
......@@ -125,7 +125,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip(
* OleQueryLinkFromClip16 [OLECLI.9]
*/
OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat) {
FIXME(ole, "(%s, %d, %d): stub!\n", (char*)(PTR_SEG_TO_LIN(name)),
FIXME("(%s, %d, %d): stub!\n", (char*)(PTR_SEG_TO_LIN(name)),
render, clipformat);
return OLE_OK;
}
......@@ -134,7 +134,7 @@ OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipf
* OleQueryLinkFromClip32 [OLECLI32.9]
*/
OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat);
FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat);
return OLE_OK;
}
......@@ -142,7 +142,7 @@ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFO
* OleQueryCreateFromClip16 [OLECLI.10]
*/
OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat) {
FIXME(ole, "(%s, %d, %d): stub!\n", (char*)(PTR_SEG_TO_LIN(name)),
FIXME("(%s, %d, %d): stub!\n", (char*)(PTR_SEG_TO_LIN(name)),
render, clipformat);
return OLE_OK;
}
......@@ -151,7 +151,7 @@ OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 cli
* OleQueryCreateFromClip32 [OLECLI32.10]
*/
OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat);
FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat);
return OLE_OK;
}
......@@ -160,7 +160,7 @@ OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIP
*/
BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
{
TRACE(ole,"(%04x)\n",hdc);
TRACE("(%04x)\n",hdc);
if (GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC ) != 0) {
GDI_HEAP_UNLOCK( hdc );
return TRUE;
......@@ -174,7 +174,7 @@ BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
*/
BOOL WINAPI OleIsDcMeta(HDC hdc)
{
TRACE(ole,"(%04x)\n",hdc);
TRACE("(%04x)\n",hdc);
if (GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC ) != 0) {
GDI_HEAP_UNLOCK( hdc );
return TRUE;
......@@ -187,7 +187,7 @@ BOOL WINAPI OleIsDcMeta(HDC hdc)
* OleSetHostNames32 [OLECLI32.15]
*/
OLESTATUS WINAPI OleSetHostNames(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) {
FIXME(ole,"(%p,%s,%s): stub\n",oleob,name1,name2);
FIXME("(%p,%s,%s): stub\n",oleob,name1,name2);
return OLE_OK;
}
......@@ -195,7 +195,7 @@ OLESTATUS WINAPI OleSetHostNames(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) {
* OleQueryType16 [OLECLI.14]
*/
OLESTATUS WINAPI OleQueryType16(LPOLEOBJECT oleob, SEGPTR xlong) {
FIXME(ole, "(%p, %p): stub!\n",
FIXME("(%p, %p): stub!\n",
PTR_SEG_TO_LIN(oleob), PTR_SEG_TO_LIN(xlong));
return OLE_OK;
}
......@@ -204,10 +204,10 @@ OLESTATUS WINAPI OleQueryType16(LPOLEOBJECT oleob, SEGPTR xlong) {
* OleQueryType32 [OLECLI32.14]
*/
OLESTATUS WINAPI OleQueryType(LPOLEOBJECT oleob,LONG*xlong) {
FIXME(ole,"(%p,%p): stub!\n",oleob,xlong);
FIXME("(%p,%p): stub!\n",oleob,xlong);
if (!oleob)
return 0x10;
TRACE(ole,"Calling OLEOBJECT.QueryType (%p) (%p,%p)\n",
TRACE("Calling OLEOBJECT.QueryType (%p) (%p,%p)\n",
oleob->lpvtbl->QueryType,oleob,xlong);
return oleob->lpvtbl->QueryType(oleob,xlong);
}
......@@ -219,7 +219,7 @@ OLESTATUS WINAPI OleCreateFromClip16(
LPCSTR name, LPOLECLIENT olecli, LHCLIENTDOC hclientdoc, LPCSTR xname,
LPOLEOBJECT *lpoleob, UINT16 render, UINT16 clipformat
) {
FIXME(ole, "(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
(char *)PTR_SEG_TO_LIN(name), HIWORD(olecli), LOWORD(olecli),
hclientdoc, (char *)PTR_SEG_TO_LIN(xname), HIWORD(lpoleob),
LOWORD(lpoleob), render, clipformat);
......@@ -233,7 +233,7 @@ OLESTATUS WINAPI OleCreateFromClip(
LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,
LPOLEOBJECT *lpoleob,OLEOPT_RENDER render, OLECLIPFORMAT clipformat
) {
FIXME(ole,"(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
name,olecli,hclientdoc,xname,lpoleob,render,clipformat);
/* clipb type, object kreieren entsprechend etc. */
return OLE_OK;
......@@ -245,7 +245,7 @@ OLESTATUS WINAPI OleCreateFromClip(
HRESULT WINAPI OleIsCurrentClipboard (
IDataObject *pDataObject) /* ptr to the data obj previously copied or cut */
{
FIXME(ole,"(DataObject %p): stub!\n", pDataObject);
FIXME("(DataObject %p): stub!\n", pDataObject);
return S_FALSE;
}
ole/oledlg.c
View file @ 359f497e
......@@ -8,7 +8,7 @@
#include "winbase.h"
#include "winerror.h"
#include "oledlg.h"
#include "debug.h"
#include "debugtools.h"
#include "ole2.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -20,7 +20,7 @@ BOOL WINAPI OleUIAddVerbMenuA(
HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
{
FIXME(ole, "(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
FIXME("(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
lpOleObj, debugstr_a(lpszShortType),
hMenu, uPos, uIDVerbMin, uIDVerbMax,
bAddConvert, idConvert, lphMenu
......@@ -37,7 +37,7 @@ BOOL WINAPI OleUIAddVerbMenuW(
HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
{
FIXME(ole, "(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
FIXME("(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
lpOleObj, debugstr_w(lpszShortType),
hMenu, uPos, uIDVerbMin, uIDVerbMax,
bAddConvert, idConvert, lphMenu
......@@ -52,7 +52,7 @@ BOOL WINAPI OleUIAddVerbMenuW(
BOOL WINAPI OleUICanConvertOrActivateAs(
REFCLSID rClsid, BOOL fIsLinkedObject, WORD wFormat)
{
FIXME(ole, "(%p, %d, %hd): stub\n",
FIXME("(%p, %d, %hd): stub\n",
rClsid, fIsLinkedObject, wFormat
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
......@@ -64,7 +64,7 @@ BOOL WINAPI OleUICanConvertOrActivateAs(
*/
UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject)
{
FIXME(ole, "(%p): stub\n", lpOleUIInsertObject);
FIXME("(%p): stub\n", lpOleUIInsertObject);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -74,7 +74,7 @@ UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject)
*/
UINT WINAPI OleUIInsertObjectW(LPOLEUIINSERTOBJECTW lpOleUIInsertObject)
{
FIXME(ole, "(%p): stub\n", lpOleUIInsertObject);
FIXME("(%p): stub\n", lpOleUIInsertObject);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -84,7 +84,7 @@ UINT WINAPI OleUIInsertObjectW(LPOLEUIINSERTOBJECTW lpOleUIInsertObject)
*/
UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial)
{
FIXME(ole, "(%p): stub\n", lpOleUIPasteSpecial);
FIXME("(%p): stub\n", lpOleUIPasteSpecial);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -94,7 +94,7 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial)
*/
UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial)
{
FIXME(ole, "(%p): stub\n", lpOleUIPasteSpecial);
FIXME("(%p): stub\n", lpOleUIPasteSpecial);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -104,7 +104,7 @@ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial)
*/
UINT WINAPI OleUIEditLinksA(LPOLEUIEDITLINKSA lpOleUIEditLinks)
{
FIXME(ole, "(%p): stub\n", lpOleUIEditLinks);
FIXME("(%p): stub\n", lpOleUIEditLinks);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -114,7 +114,7 @@ UINT WINAPI OleUIEditLinksA(LPOLEUIEDITLINKSA lpOleUIEditLinks)
*/
UINT WINAPI OleUIEditLinksW(LPOLEUIEDITLINKSW lpOleUIEditLinks)
{
FIXME(ole, "(%p): stub\n", lpOleUIEditLinks);
FIXME("(%p): stub\n", lpOleUIEditLinks);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -125,7 +125,7 @@ UINT WINAPI OleUIEditLinksW(LPOLEUIEDITLINKSW lpOleUIEditLinks)
UINT WINAPI OleUIChangeIconA(
LPOLEUICHANGEICONA lpOleUIChangeIcon)
{
FIXME(ole, "(%p): stub\n", lpOleUIChangeIcon);
FIXME("(%p): stub\n", lpOleUIChangeIcon);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -136,7 +136,7 @@ UINT WINAPI OleUIChangeIconA(
UINT WINAPI OleUIChangeIconW(
LPOLEUICHANGEICONW lpOleUIChangeIcon)
{
FIXME(ole, "(%p): stub\n", lpOleUIChangeIcon);
FIXME("(%p): stub\n", lpOleUIChangeIcon);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -146,7 +146,7 @@ UINT WINAPI OleUIChangeIconW(
*/
UINT WINAPI OleUIConvertA(LPOLEUICONVERTA lpOleUIConvert)
{
FIXME(ole, "(%p): stub\n", lpOleUIConvert);
FIXME("(%p): stub\n", lpOleUIConvert);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -156,7 +156,7 @@ UINT WINAPI OleUIConvertA(LPOLEUICONVERTA lpOleUIConvert)
*/
UINT WINAPI OleUIConvertW(LPOLEUICONVERTW lpOleUIConvert)
{
FIXME(ole, "(%p): stub\n", lpOleUIConvert);
FIXME("(%p): stub\n", lpOleUIConvert);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -166,7 +166,7 @@ UINT WINAPI OleUIConvertW(LPOLEUICONVERTW lpOleUIConvert)
*/
UINT WINAPI OleUIBusyA(LPOLEUIBUSYA lpOleUIBusy)
{
FIXME(ole, "(%p): stub\n", lpOleUIBusy);
FIXME("(%p): stub\n", lpOleUIBusy);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -176,7 +176,7 @@ UINT WINAPI OleUIBusyA(LPOLEUIBUSYA lpOleUIBusy)
*/
UINT WINAPI OleUIBusyW(LPOLEUIBUSYW lpOleUIBusy)
{
FIXME(ole, "(%p): stub\n", lpOleUIBusy);
FIXME("(%p): stub\n", lpOleUIBusy);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -188,7 +188,7 @@ BOOL WINAPI OleUIUpdateLinksA(
LPOLEUILINKCONTAINERA lpOleUILinkCntr,
HWND hwndParent, LPSTR lpszTitle, INT cLinks)
{
FIXME(ole,"(%p, 0x%08x, %s, %d): stub\n",
FIXME("(%p, 0x%08x, %s, %d): stub\n",
lpOleUILinkCntr, hwndParent, debugstr_a(lpszTitle), cLinks
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
......@@ -205,7 +205,7 @@ BOOL WINAPI OleUIUpdateLinksW(
LPOLEUILINKCONTAINERW lpOleUILinkCntr,
HWND hwndParent, LPWSTR lpszTitle, INT cLinks)
{
FIXME(ole, "(%p, 0x%08x, %s, %d): stub\n",
FIXME("(%p, 0x%08x, %s, %d): stub\n",
lpOleUILinkCntr, hwndParent, debugstr_w(lpszTitle), cLinks
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
......@@ -218,7 +218,7 @@ BOOL WINAPI OleUIUpdateLinksW(
INT __cdecl OleUIPromptUserA(
INT nTemplate, HWND hwndParent, ...)
{
FIXME(ole, "(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
FIXME("(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -229,7 +229,7 @@ INT __cdecl OleUIPromptUserA(
INT __cdecl OleUIPromptUserW(
INT nTemplate, HWND hwndParent, ...)
{
FIXME(ole, "(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
FIXME("(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -240,7 +240,7 @@ INT __cdecl OleUIPromptUserW(
UINT WINAPI OleUIObjectPropertiesA(
LPOLEUIOBJECTPROPSA lpOleUIObjectProps)
{
FIXME(ole, "(%p): stub\n", lpOleUIObjectProps);
FIXME("(%p): stub\n", lpOleUIObjectProps);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -251,7 +251,7 @@ UINT WINAPI OleUIObjectPropertiesA(
UINT WINAPI OleUIObjectPropertiesW(
LPOLEUIOBJECTPROPSW lpOleUIObjectProps)
{
FIXME(ole, "(%p): stub\n", lpOleUIObjectProps);
FIXME("(%p): stub\n", lpOleUIObjectProps);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -262,7 +262,7 @@ UINT WINAPI OleUIObjectPropertiesW(
UINT WINAPI OleUIChangeSourceA(
LPOLEUICHANGESOURCEA lpOleUIChangeSource)
{
FIXME(ole, "(%p): stub\n", lpOleUIChangeSource);
FIXME("(%p): stub\n", lpOleUIChangeSource);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......@@ -273,7 +273,7 @@ UINT WINAPI OleUIChangeSourceA(
UINT WINAPI OleUIChangeSourceW(
LPOLEUICHANGESOURCEW lpOleUIChangeSource)
{
FIXME(ole, "(%p): stub\n", lpOleUIChangeSource);
FIXME("(%p): stub\n", lpOleUIChangeSource);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
......
ole/olefont.c
View file @ 359f497e
......@@ -12,7 +12,7 @@
#include "oleauto.h"
#include "ocidl.h"
#include "olectl.h"
#include "debug.h"
#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -405,7 +405,7 @@ HRESULT WINAPI OLEFontImpl_QueryInterface(
WINE_StringFromCLSID((LPCLSID)riid,clsid);
WARN(ole,
WARN(
"() : asking for un supported interface %s\n",
clsid);
......@@ -571,7 +571,7 @@ static HRESULT WINAPI OLEFontImpl_get_Bold(
IFont* iface,
BOOL* pbold)
{
FIXME(ole,"():Stub\n");
FIXME("():Stub\n");
return E_NOTIMPL;
}
......@@ -584,7 +584,7 @@ static HRESULT WINAPI OLEFontImpl_put_Bold(
IFont* iface,
BOOL bold)
{
FIXME(ole,"():Stub\n");
FIXME("():Stub\n");
return E_NOTIMPL;
}
......@@ -882,7 +882,7 @@ static HRESULT WINAPI OLEFontImpl_IsEqual(
IFont* iface,
IFont* pFontOther)
{
FIXME(ole,"():Stub\n");
FIXME("():Stub\n");
return E_NOTIMPL;
}
......@@ -913,7 +913,7 @@ static HRESULT WINAPI OLEFontImpl_QueryTextMetrics(
IFont* iface,
TEXTMETRICOLE* ptm)
{
FIXME(ole,"():Stub\n");
FIXME("():Stub\n");
return E_NOTIMPL;
}
......@@ -975,7 +975,7 @@ static HRESULT WINAPI OLEFontImpl_SetHdc(
IFont* iface,
HDC hdc)
{
FIXME(ole,"():Stub\n");
FIXME("():Stub\n");
return E_NOTIMPL;
}
......@@ -1029,7 +1029,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfoCount(
IDispatch* iface,
unsigned int* pctinfo)
{
FIXME(ole,"():Stub\n");
FIXME("():Stub\n");
return E_NOTIMPL;
}
......@@ -1045,7 +1045,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
LCID lcid,
ITypeInfo** ppTInfo)
{
FIXME(ole,"():Stub\n");
FIXME("():Stub\n");
return E_NOTIMPL;
}
......@@ -1063,7 +1063,7 @@ static HRESULT WINAPI OLEFontImpl_GetIDsOfNames(
LCID lcid,
DISPID* rgDispId)
{
FIXME(ole,"():Stub\n");
FIXME("():Stub\n");
return E_NOTIMPL;
}
......@@ -1084,7 +1084,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
EXCEPINFO* pExepInfo,
UINT* puArgErr)
{
FIXME(ole,"():Stub\n");
FIXME("():Stub\n");
return E_NOTIMPL;
}
......
ole/oleobj.c
View file @ 359f497e
......@@ -10,7 +10,7 @@
#include "winbase.h"
#include "winerror.h"
#include "oleidl.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -194,7 +194,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_Advise(
ICOM_THIS(OleAdviseHolderImpl, iface);
TRACE(ole, "(%p, %p, %p)\n", This, pAdvise, pdwConnection);
TRACE("(%p, %p, %p)\n", This, pAdvise, pdwConnection);
/*
* Sanity check
......@@ -258,7 +258,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_Unadvise(
{
ICOM_THIS(OleAdviseHolderImpl, iface);
TRACE(ole, "(%p, %lu)\n", This, dwConnection);
TRACE("(%p, %lu)\n", This, dwConnection);
/*
* So we don't return 0 as a cookie, the index was
......@@ -293,7 +293,7 @@ static HRESULT WINAPI
OleAdviseHolderImpl_EnumAdvise (LPOLEADVISEHOLDER iface, IEnumSTATDATA **ppenumAdvise)
{
ICOM_THIS(OleAdviseHolderImpl, iface);
FIXME (ole, "(%p)->(%p)\n", This, ppenumAdvise);
FIXME("(%p)->(%p)\n", This, ppenumAdvise);
*ppenumAdvise = NULL;
......@@ -307,7 +307,7 @@ static HRESULT WINAPI
OleAdviseHolderImpl_SendOnRename (LPOLEADVISEHOLDER iface, IMoniker *pmk)
{
ICOM_THIS(OleAdviseHolderImpl, iface);
FIXME (ole, "(%p)->(%p)\n", This, pmk);
FIXME("(%p)->(%p)\n", This, pmk);
return S_OK;
......@@ -320,7 +320,7 @@ static HRESULT WINAPI
OleAdviseHolderImpl_SendOnSave (LPOLEADVISEHOLDER iface)
{
ICOM_THIS(OleAdviseHolderImpl, iface);
FIXME (ole, "(%p)\n", This);
FIXME("(%p)\n", This);
return S_OK;
......@@ -333,7 +333,7 @@ static HRESULT WINAPI
OleAdviseHolderImpl_SendOnClose (LPOLEADVISEHOLDER iface)
{
ICOM_THIS(OleAdviseHolderImpl, iface);
FIXME (ole, "(%p)\n", This);
FIXME("(%p)\n", This);
return S_OK;
......@@ -524,7 +524,7 @@ static HRESULT WINAPI DataAdviseHolder_Advise(
IAdviseSink* pAdvise,
DWORD* pdwConnection)
{
FIXME(ole, "(): stub\n");
FIXME("(): stub\n");
return E_NOTIMPL;
}
......@@ -532,7 +532,7 @@ static HRESULT WINAPI DataAdviseHolder_Unadvise(
IDataAdviseHolder* iface,
DWORD dwConnection)
{
FIXME(ole, "(): stub\n");
FIXME("(): stub\n");
return E_NOTIMPL;
}
......@@ -540,7 +540,7 @@ static HRESULT WINAPI DataAdviseHolder_EnumAdvise(
IDataAdviseHolder* iface,
IEnumSTATDATA** ppenumAdvise)
{
FIXME(ole, "(): stub\n");
FIXME("(): stub\n");
return E_NOTIMPL;
}
......@@ -550,7 +550,7 @@ static HRESULT WINAPI DataAdviseHolder_SendOnDataChange(
DWORD dwReserved,
DWORD advf)
{
FIXME(ole, "(): stub\n");
FIXME("(): stub\n");
return E_NOTIMPL;
}
......@@ -564,7 +564,7 @@ static HRESULT WINAPI DataAdviseHolder_SendOnDataChange(
HRESULT WINAPI CreateOleAdviseHolder(
LPOLEADVISEHOLDER *ppOAHolder)
{
TRACE(ole, "(%p)\n", ppOAHolder);
TRACE("(%p)\n", ppOAHolder);
/*
* Sanity check,
......@@ -586,7 +586,7 @@ HRESULT WINAPI CreateOleAdviseHolder(
HRESULT WINAPI CreateDataAdviseHolder(
LPDATAADVISEHOLDER* ppDAHolder)
{
TRACE(ole,"(%p)\n", ppDAHolder);
TRACE("(%p)\n", ppDAHolder);
/*
* Sanity check,
......
ole/olesvr.c
View file @ 359f497e
......@@ -8,7 +8,7 @@
*/
#include "ole.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -21,7 +21,7 @@ OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct,
LHSERVER *hRet, HINSTANCE16 hServer,
OLE_SERVER_USE use )
{
FIXME(ole,"(%s,...): stub\n",name);
FIXME("(%s,...): stub\n",name);
*hRet=++OLE_current_handle;
/* return OLE_ERROR_MEMORY, OLE_ERROR_PROTECT_ONLY if you want it fail*/
return OLE_OK;
......@@ -32,7 +32,7 @@ OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct,
*/
OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer)
{
FIXME(ole,"(%ld): stub\n",hServer);
FIXME("(%ld): stub\n",hServer);
return OLE_OK;
}
......@@ -41,7 +41,7 @@ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer)
*/
OLESTATUS WINAPI OleBlockServer(LHSERVER hServer)
{
FIXME(ole,"(%ld): stub\n",hServer);
FIXME("(%ld): stub\n",hServer);
return OLE_OK;
}
......@@ -50,7 +50,7 @@ OLESTATUS WINAPI OleBlockServer(LHSERVER hServer)
*/
OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block)
{
FIXME(ole,"(%ld): stub\n",hServer);
FIXME("(%ld): stub\n",hServer);
/* no more blocked messages :) */
*block=FALSE;
return OLE_OK;
......@@ -61,7 +61,7 @@ OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block)
*/
OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block)
{
FIXME(ole,"(%ld): stub\n",hServer);
FIXME("(%ld): stub\n",hServer);
/* no more blocked messages :) */
*block=FALSE;
return OLE_OK;
......@@ -74,7 +74,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname,
LPOLESERVERDOC document,
LHSERVERDOC *hRet)
{
FIXME(ole,"(%ld,%s): stub\n",hServer, docname);
FIXME("(%ld,%s): stub\n",hServer, docname);
*hRet=++OLE_current_handle;
return OLE_OK;
}
......@@ -84,7 +84,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname,
*/
OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc)
{
FIXME(ole,"%ld - stub\n",hServerDoc);
FIXME("%ld - stub\n",hServerDoc);
return OLE_OK;
}
......@@ -93,7 +93,7 @@ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc)
*/
OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc)
{
FIXME(ole,"(%ld): stub\n",hServerDoc);
FIXME("(%ld): stub\n",hServerDoc);
return OLE_OK;
}
......@@ -102,7 +102,7 @@ OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc)
*/
OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer)
{
FIXME(ole,"%ld - stub\n",hServer);
FIXME("%ld - stub\n",hServer);
return OLE_OK;
}
......@@ -110,7 +110,7 @@ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer)
* OleRegisterServer32 [OLESVR32.2]
*/
OLESTATUS WINAPI OleRegisterServer(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* hRet,HINSTANCE hinst,OLE_SERVER_USE osu) {
FIXME(ole,"(%s,%p,%p,%08x,%d): stub!\n",svrname,olesvr,hRet,hinst,osu);
FIXME("(%s,%p,%p,%08x,%d): stub!\n",svrname,olesvr,hRet,hinst,osu);
*hRet=++OLE_current_handle;
return OLE_OK;
}
......@@ -122,7 +122,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname,
LPOLESERVERDOC document,
LHSERVERDOC *hRet)
{
FIXME(ole,"(%ld,%s): stub\n", hServer, docname);
FIXME("(%ld,%s): stub\n", hServer, docname);
*hRet=++OLE_current_handle;
return OLE_OK;
}
......@@ -133,6 +133,6 @@ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname,
*/
OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName)
{
FIXME(ole,"(%ld,%s): stub.\n",hDoc, newName);
FIXME("(%ld,%s): stub.\n",hDoc, newName);
return OLE_OK;
}
ole/safearray.c
View file @ 359f497e
......@@ -14,7 +14,7 @@
#include "winbase.h"
#include "oleauto.h"
#include "wine/obj_base.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -121,7 +121,7 @@ HRESULT WINAPI SafeArrayAllocDescriptor(
GetProcessHeap(), HEAP_ZERO_MEMORY, allocSize)) == NULL){
return(E_UNEXPECTED);
}
TRACE(ole,"SafeArray: %lu bytes allocated for descriptor.\n", allocSize);
TRACE("SafeArray: %lu bytes allocated for descriptor.\n", allocSize);
return(S_OK);
}
......@@ -144,7 +144,7 @@ HRESULT WINAPI SafeArrayAllocData(
psa->cbElements*ulWholeArraySize)) == NULL)
return(E_UNEXPECTED);
TRACE(ole, "SafeArray: %lu bytes allocated for data at %p (%lu objects).\n",
TRACE("SafeArray: %lu bytes allocated for data at %p (%lu objects).\n",
psa->cbElements*ulWholeArraySize, psa->pvData, ulWholeArraySize);
return(S_OK);
......@@ -187,7 +187,7 @@ SAFEARRAY* WINAPI SafeArrayCreate(
/* allocate memory for the data... */
if( FAILED( hRes = SafeArrayAllocData(psa))) {
SafeArrayDestroyDescriptor(psa);
ERR(ole,"() : Failed to allocate the Safe Array data\n");
ERR("() : Failed to allocate the Safe Array data\n");
return NULL;
}
......@@ -293,11 +293,11 @@ HRESULT WINAPI SafeArrayPutElement(
}
} else {
ERR(ole, "SafeArray: Cannot lock array....\n");
ERR("SafeArray: Cannot lock array....\n");
return E_UNEXPECTED; /* UNDOC error condition */
}
TRACE(ole,"SafeArray: item put at adress %p.\n",elementStorageAddress);
TRACE("SafeArray: item put at adress %p.\n",elementStorageAddress);
return SafeArrayUnlock(psa);
}
......@@ -343,7 +343,7 @@ HRESULT WINAPI SafeArrayGetElement(
memcpy(pv, elementStorageAddress, SafeArrayGetElemsize(psa) );
} else {
ERR(ole, "SafeArray: Cannot lock array....\n");
ERR("SafeArray: Cannot lock array....\n");
return E_UNEXPECTED; /* UNDOC error condition */
}
......@@ -873,7 +873,7 @@ static ULONG calcDisplacement(
res += ((coor[iterDim]-mat[iterDim].lLbound) *
endOfDim(coor, mat, iterDim+1, dim));
TRACE(ole, "SafeArray: calculated displacement is %lu.\n", res);
TRACE("SafeArray: calculated displacement is %lu.\n", res);
return(res);
}
......
ole/stg_bigblockfile.c
View file @ 359f497e
......@@ -30,7 +30,7 @@
#include "storage32.h"
#include "debug.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(storage)
......@@ -209,7 +209,7 @@ static BOOL BIGBLOCKFILE_MemInit(LPBIGBLOCKFILE This, ILockBytes* plkbyt)
*/
if (GetHGlobalFromILockBytes(plkbyt, &(This->hbytearray)) != S_OK)
{
FIXME(storage, "May not be an ILockBytes on HGLOBAL\n");
FIXME("May not be an ILockBytes on HGLOBAL\n");
return FALSE;
}
......
ole/stg_stream.c
View file @ 359f497e
......@@ -15,7 +15,7 @@
#include "winbase.h"
#include "winerror.h"
#include "debug.h"
#include "debugtools.h"
#include "wine/obj_storage.h"
#include "storage32.h"
......@@ -114,7 +114,7 @@ StgStreamImpl* StgStreamImpl_Construct(
*/
void StgStreamImpl_Destroy(StgStreamImpl* This)
{
TRACE(storage, "(%p)\n", This);
TRACE("(%p)\n", This);
/*
* Release the reference we are holding on the parent storage.
......@@ -318,7 +318,7 @@ HRESULT WINAPI StgStreamImpl_Read(
ULONG bytesReadBuffer;
ULONG bytesToReadFromBuffer;
TRACE(storage, "(%p, %p, %ld, %p)\n",
TRACE("(%p, %p, %ld, %p)\n",
iface, pv, cb, pcbRead);
/*
......@@ -401,7 +401,7 @@ HRESULT WINAPI StgStreamImpl_Write(
ULARGE_INTEGER newSize;
ULONG bytesWritten = 0;
TRACE(storage, "(%p, %p, %ld, %p)\n",
TRACE("(%p, %p, %ld, %p)\n",
iface, pv, cb, pcbWritten);
/*
......@@ -485,7 +485,7 @@ HRESULT WINAPI StgStreamImpl_Seek(
ULARGE_INTEGER newPosition;
TRACE(storage, "(%p, %ld, %ld, %p)\n",
TRACE("(%p, %ld, %ld, %p)\n",
iface, dlibMove.LowPart, dwOrigin, plibNewPosition);
/*
......@@ -564,7 +564,7 @@ HRESULT WINAPI StgStreamImpl_SetSize(
StgProperty curProperty;
BOOL Success;
TRACE(storage, "(%p, %ld)\n", iface, libNewSize.LowPart);
TRACE("(%p, %ld)\n", iface, libNewSize.LowPart);
/*
* As documented.
......@@ -669,7 +669,7 @@ HRESULT WINAPI StgStreamImpl_CopyTo(
ULARGE_INTEGER totalBytesRead;
ULARGE_INTEGER totalBytesWritten;
TRACE(storage, "(%p, %p, %ld, %p, %p)\n",
TRACE("(%p, %p, %ld, %p, %p)\n",
iface, pstm, cb.LowPart, pcbRead, pcbWritten);
/*
......@@ -768,7 +768,7 @@ HRESULT WINAPI StgStreamImpl_LockRegion(
ULARGE_INTEGER cb, /* [in] */
DWORD dwLockType) /* [in] */
{
FIXME(storage, "not implemented!\n");
FIXME("not implemented!\n");
return E_NOTIMPL;
}
......@@ -778,7 +778,7 @@ HRESULT WINAPI StgStreamImpl_UnlockRegion(
ULARGE_INTEGER cb, /* [in] */
DWORD dwLockType) /* [in] */
{
FIXME(storage, "not implemented!\n");
FIXME("not implemented!\n");
return E_NOTIMPL;
}
......@@ -823,6 +823,6 @@ HRESULT WINAPI StgStreamImpl_Clone(
IStream* iface,
IStream** ppstm) /* [out] */
{
FIXME(storage, "not implemented!\n");
FIXME("not implemented!\n");
return E_NOTIMPL;
}
ole/storage32.c
View file @ 359f497e
......@@ -21,7 +21,7 @@
#include "wine/winestring.h"
#include "crtdll.h"
#include "tchar.h"
#include "debug.h"
#include "debugtools.h"
#include "windef.h"
#include "storage32.h"
......@@ -284,7 +284,7 @@ HRESULT WINAPI StorageBaseImpl_OpenStream(
StgProperty currentProperty;
ULONG foundPropertyIndex;
TRACE(storage, "(%p, %s, %p, %lx, %ld, %p)\n",
TRACE("(%p, %s, %p, %lx, %ld, %p)\n",
iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm);
/*
......@@ -381,7 +381,7 @@ HRESULT WINAPI StorageBaseImpl_OpenStorage(
StgProperty currentProperty;
ULONG foundPropertyIndex;
TRACE(storage, "(%p, %s, %p, %lx, %p, %ld, %p)\n",
TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n",
iface, debugstr_w(pwcsName), pstgPriority,
grfMode, snbExclude, reserved, ppstg);
......@@ -480,7 +480,7 @@ HRESULT WINAPI StorageBaseImpl_EnumElements(
ICOM_THIS(StorageBaseImpl,iface);
IEnumSTATSTGImpl* newEnum;
TRACE(storage, "(%p, %ld, %p, %ld, %p)\n",
TRACE("(%p, %ld, %p, %ld, %p)\n",
iface, reserved1, reserved2, reserved3, ppenum);
/*
......@@ -528,7 +528,7 @@ HRESULT WINAPI StorageBaseImpl_Stat(
StgProperty curProperty;
BOOL readSucessful;
TRACE(storage, "(%p, %p, %lx)\n",
TRACE("(%p, %p, %lx)\n",
iface, pstatstg, grfStatFlag);
/*
......@@ -579,7 +579,7 @@ HRESULT WINAPI StorageBaseImpl_RenameElement(
StgProperty currentProperty;
ULONG foundPropertyIndex;
TRACE(storage, "(%p, %s, %s)\n",
TRACE("(%p, %s, %s)\n",
iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName));
/*
......@@ -734,7 +734,7 @@ HRESULT WINAPI StorageBaseImpl_CreateStream(
StgProperty currentProperty, newStreamProperty;
ULONG foundPropertyIndex, newPropertyIndex;
TRACE(storage, "(%p, %s, %lx, %ld, %ld, %p)\n",
TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
iface, debugstr_w(pwcsName), grfMode,
reserved1, reserved2, ppstm);
......@@ -883,7 +883,7 @@ HRESULT WINAPI StorageBaseImpl_SetClass(
StgProperty curProperty;
BOOL success;
TRACE(storage, "(%p, %p)\n", iface, clsid);
TRACE("(%p, %p)\n", iface, clsid);
success = StorageImpl_ReadProperty(This->ancestorStorage,
This->rootPropertySetIndex,
......@@ -930,7 +930,7 @@ HRESULT WINAPI StorageImpl_CreateStorage(
ULONG newPropertyIndex;
HRESULT hr;
TRACE(storage, "(%p, %s, %lx, %ld, %ld, %p)\n",
TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
iface, debugstr_w(pwcsName), grfMode,
reserved1, reserved2, ppstg);
......@@ -1303,9 +1303,9 @@ HRESULT WINAPI StorageImpl_CopyTo(
IStream *pstrTmp, *pstrChild;
if ((ciidExclude != 0) || (rgiidExclude != NULL) || (snbExclude != NULL))
FIXME( storage, "Exclude option not implemented\n");
FIXME("Exclude option not implemented\n");
TRACE(storage, "(%p, %ld, %p, %p, %p)\n",
TRACE("(%p, %ld, %p, %p, %p)\n",
iface, ciidExclude, rgiidExclude,
snbExclude, pstgDest);
......@@ -1439,7 +1439,7 @@ HRESULT WINAPI StorageImpl_CopyTo(
}
else
{
WARN(storage, "unknown element type: %ld\n", curElement.type);
WARN("unknown element type: %ld\n", curElement.type);
}
} while (hr == S_OK);
......@@ -1462,7 +1462,7 @@ HRESULT WINAPI StorageImpl_MoveElementTo(
const OLECHAR *pwcsNewName,/* [string][in] */
DWORD grfFlags) /* [in] */
{
FIXME(storage, "not implemented!\n");
FIXME("not implemented!\n");
return E_NOTIMPL;
}
......@@ -1473,7 +1473,7 @@ HRESULT WINAPI StorageImpl_Commit(
IStorage* iface,
DWORD grfCommitFlags)/* [in] */
{
FIXME(storage, "(%ld): stub!\n", grfCommitFlags);
FIXME("(%ld): stub!\n", grfCommitFlags);
return S_OK;
}
......@@ -1483,7 +1483,7 @@ HRESULT WINAPI StorageImpl_Commit(
HRESULT WINAPI StorageImpl_Revert(
IStorage* iface)
{
FIXME(storage, "not implemented!\n");
FIXME("not implemented!\n");
return E_NOTIMPL;
}
......@@ -1513,7 +1513,7 @@ HRESULT WINAPI StorageImpl_DestroyElement(
ULONG typeOfRelation;
ULONG parentPropertyId;
TRACE(storage, "(%p, %s)\n",
TRACE("(%p, %s)\n",
iface, debugstr_w(pwcsName));
/*
......@@ -2007,7 +2007,7 @@ HRESULT WINAPI StorageImpl_SetElementTimes(
const FILETIME *patime, /* [in] */
const FILETIME *pmtime) /* [in] */
{
FIXME(storage, "not implemented!\n");
FIXME("not implemented!\n");
return E_NOTIMPL;
}
......@@ -2019,7 +2019,7 @@ HRESULT WINAPI StorageImpl_SetStateBits(
DWORD grfStateBits,/* [in] */
DWORD grfMask) /* [in] */
{
FIXME(storage, "not implemented!\n");
FIXME("not implemented!\n");
return E_NOTIMPL;
}
......@@ -2218,7 +2218,7 @@ HRESULT StorageImpl_Construct(
void StorageImpl_Destroy(
StorageImpl* This)
{
TRACE(storage, "(%p)\n", This);
TRACE("(%p)\n", This);
BlockChainStream_Destroy(This->smallBlockRootChain);
BlockChainStream_Destroy(This->rootBlockChain);
......@@ -5204,7 +5204,7 @@ HRESULT WINAPI StgCreateDocfile(
DWORD fileAttributes;
WCHAR tempFileName[MAX_PATH];
TRACE(storage, "(%s, %lx, %ld, %p)\n",
TRACE("(%s, %lx, %ld, %p)\n",
debugstr_w(pwcsName), grfMode,
reserved, ppstgOpen);
......@@ -5253,7 +5253,7 @@ HRESULT WINAPI StgCreateDocfile(
fileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS;
if (grfMode & STGM_TRANSACTED)
FIXME(storage, "Transacted mode not implemented.\n");
FIXME("Transacted mode not implemented.\n");
/*
* Initialize the "out" parameter.
......@@ -5322,7 +5322,7 @@ HRESULT WINAPI StgOpenStorage(
DWORD shareMode;
DWORD accessMode;
TRACE(storage, "(%s, %p, %lx, %p, %ld, %p)\n",
TRACE("(%s, %p, %lx, %p, %ld, %p)\n",
debugstr_w(pwcsName), pstgPriority, grfMode,
snbExclude, reserved, ppstgOpen);
......@@ -5555,7 +5555,7 @@ HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid){
STATSTG pstatstg;
HRESULT hRes;
TRACE(storage,"()\n");
TRACE("()\n");
if(pclsid==NULL)
return E_POINTER;
......@@ -5580,7 +5580,7 @@ HRESULT WINAPI OleLoadFromStream(IStream *pStm,REFIID iidInterface,void** ppvOb
CLSID clsid;
HRESULT res;
FIXME(storage,"(),stub!\n");
FIXME("(),stub!\n");
res=ReadClassStm(pStm,&clsid);
......@@ -5607,7 +5607,7 @@ HRESULT WINAPI OleSaveToStream(IPersistStream *pPStm,IStream *pStm)
CLSID clsid;
HRESULT res;
TRACE(storage,"(%p,%p)\n",pPStm,pStm);
TRACE("(%p,%p)\n",pPStm,pStm);
res=IPersistStream_GetClassID(pPStm,&clsid);
......@@ -5797,11 +5797,11 @@ static DWORD GetCreationModeFromSTGM(DWORD stgm)
if ( stgm & STGM_CREATE)
return CREATE_ALWAYS;
if (stgm & STGM_CONVERT) {
FIXME(storage, "STGM_CONVERT not implemented!\n");
FIXME("STGM_CONVERT not implemented!\n");
return CREATE_NEW;
}
/* All other cases */
if (stgm & ~ (STGM_CREATE|STGM_CONVERT))
FIXME(storage,"unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
return CREATE_NEW;
}
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