system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-15 15:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Stridvall.
This commit is contained in:
Alexandre Julliard 1999-05-14 08:17:14 +00:00
parent ded196cb13
commit 9fe7a2545a
47 changed files with 501 additions and 504 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
console/generic.c
View file

@ -14,7 +14,7 @@
#include "console.h" #include "console.h"
#include "config.h" #include "config.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(console) DEFAULT_DEBUG_CHANNEL(console)
@ -26,7 +26,7 @@ void GENERIC_Start()
/* Here, we only want to add a driver if there is not one already /* Here, we only want to add a driver if there is not one already
defined. */ defined. */
TRACE(console, "GENERIC_Start\n"); TRACE("GENERIC_Start\n");
if (!driver.clearWindow) if (!driver.clearWindow)
driver.clearWindow = GENERIC_ClearWindow; driver.clearWindow = GENERIC_ClearWindow;
@ -72,7 +72,7 @@ void GENERIC_ScrollUpWindow(char row1, char col1, char row2, char col2,
char trow, tcol; char trow, tcol;
int old_refresh, x; int old_refresh, x;
TRACE(console, "Scroll Up %d lines from %d to %d.\n", lines, row1, TRACE("Scroll Up %d lines from %d to %d.\n", lines, row1,
row2); row2);
/* Abort if we have only partial functionality */ /* Abort if we have only partial functionality */
@ -146,7 +146,7 @@ static void GENERIC_ClearLine(char row, char col1, char col2, int bgcolor,
int x; int x;
TRACE(console, "Clear Line: %d from %d to %d.\n", row, col1, col2); TRACE("Clear Line: %d from %d to %d.\n", row, col1, col2);
for (x = col1; x <= col2; x++) for (x = col1; x <= col2; x++)
{ {
@ -169,7 +169,7 @@ static void GENERIC_MoveLine(char row1, char row2, char col1, char col2)
int bg_color, fg_color, attribute; int bg_color, fg_color, attribute;
char ch; char ch;
TRACE(console, "Move Line: Move %d to %d.\n", row1, row2); TRACE("Move Line: Move %d to %d.\n", row1, row2);
for (x = col1; x <= col2; x++) for (x = col1; x <= col2; x++)
{ {

14
console/ncurses.c
View file

@ -21,7 +21,7 @@
driver, it should make sure to perserve the old values. driver, it should make sure to perserve the old values.
*/ */
#include "debug.h" #include "debugtools.h"
#include "options.h" #include "options.h"
DEFAULT_DEBUG_CHANNEL(console) DEFAULT_DEBUG_CHANNEL(console)
@ -107,7 +107,7 @@ void NCURSES_Write(char output, int fg, int bg, int attribute)
if (waddch(stdscr, output | COLOR_PAIR(pair)) == ERR) if (waddch(stdscr, output | COLOR_PAIR(pair)) == ERR)
{ {
NCURSES_GetCursorPosition(&row, &col); NCURSES_GetCursorPosition(&row, &col);
FIXME(console, "NCURSES: waddch() failed at %d, %d.\n", row, col); FIXME("NCURSES: waddch() failed at %d, %d.\n", row, col);
} }
} }
@ -148,7 +148,7 @@ int NCURSES_CheckForKeystroke(char *scan, char *ascii)
void NCURSES_MoveCursor(char row, char col) void NCURSES_MoveCursor(char row, char col)
{ {
if (wmove(stdscr, row, col) == ERR) if (wmove(stdscr, row, col) == ERR)
FIXME(console, "NCURSES: wmove() failed to %d, %d.\n", row, col); FIXME("NCURSES: wmove() failed to %d, %d.\n", row, col);
} }
void NCURSES_GetCursorPosition(char *row, char *col) void NCURSES_GetCursorPosition(char *row, char *col)
@ -201,7 +201,7 @@ int NCURSES_AllocColor(int color)
case WINE_CYAN: return COLOR_CYAN; case WINE_CYAN: return COLOR_CYAN;
} }
FIXME(console, "Unable to allocate color %d (%s)\n", color, FIXME("Unable to allocate color %d (%s)\n", color,
color_names[color]); color_names[color]);
/* Don't allocate a color... yet */ /* Don't allocate a color... yet */
@ -242,7 +242,7 @@ void NCURSES_NotifyResizeScreen(int x, int y)
calls ResizeScreen(). It is meant to resize the ncurses internal calls ResizeScreen(). It is meant to resize the ncurses internal
data structures to know about the new window dimensions. */ data structures to know about the new window dimensions. */
TRACE(console, "Terminal resized to y: %d, x: %d\n", y, x); TRACE("Terminal resized to y: %d, x: %d\n", y, x);
resizeterm(y, x); resizeterm(y, x);
} }
@ -267,7 +267,7 @@ static int get_color_pair(int fg_color, int bg_color)
{ {
if ((fg_color == fg[x]) && (bg_color == bg[x])) if ((fg_color == fg[x]) && (bg_color == bg[x]))
{ {
TRACE(console, "Color pair: already allocated\n"); TRACE("Color pair: already allocated\n");
return x; return x;
} }
} }
@ -276,7 +276,7 @@ static int get_color_pair(int fg_color, int bg_color)
current++; current++;
fg[current] = fg_color; fg[current] = fg_color;
bg[current] = bg_color; bg[current] = bg_color;
TRACE(console, "Color pair: allocated.\n"); TRACE("Color pair: allocated.\n");
return init_pair(current, fg_color, bg_color); return init_pair(current, fg_color, bg_color);
} }

6
console/xterm.c
View file

@ -19,7 +19,7 @@
#include "console.h" #include "console.h"
#include "options.h" #include "options.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(console) DEFAULT_DEBUG_CHANNEL(console)
@ -139,7 +139,7 @@ static BOOL wine_create_console(FILE **master, FILE **slave, int *pid)
execlp(console_xterm_prog, console_xterm_prog, buf, "-fg", execlp(console_xterm_prog, console_xterm_prog, buf, "-fg",
"white", "-bg", "black", "-g", "white", "-bg", "black", "-g",
xterm_resolution, NULL); xterm_resolution, NULL);
ERR(console, "error creating xterm (file not found?)\n"); ERR("error creating xterm (file not found?)\n");
exit(1); exit(1);
} }
@ -155,7 +155,7 @@ static BOOL wine_create_console(FILE **master, FILE **slave, int *pid)
usleep(100); usleep(100);
} }
if (i > 10000) { if (i > 10000) {
WARN(console, "can't read xterm WID\n"); WARN("can't read xterm WID\n");
kill(*pid, SIGKILL); kill(*pid, SIGKILL);
return FALSE; return FALSE;
} }

42
controls/combo.c
View file

@ -17,7 +17,7 @@
#include "heap.h" #include "heap.h"
#include "combo.h" #include "combo.h"
#include "drive.h" #include "drive.h"
#include "debug.h" #include "debugtools.h"
#include "tweak.h" #include "tweak.h"
DEFAULT_DEBUG_CHANNEL(combo) DEFAULT_DEBUG_CHANNEL(combo)
@ -74,7 +74,7 @@ static BOOL COMBO_Init()
CBitHeight = bm.bmHeight; CBitHeight = bm.bmHeight;
CBitWidth = bm.bmWidth; CBitWidth = bm.bmWidth;
TRACE(combo, "combo bitmap [%i,%i]\n", CBitWidth, CBitHeight ); TRACE("combo bitmap [%i,%i]\n", CBitWidth, CBitHeight );
hPrevB = SelectObject16( hDC, hComboBmp); hPrevB = SelectObject16( hDC, hComboBmp);
SetRect( &r, 0, 0, CBitWidth, CBitHeight ); SetRect( &r, 0, 0, CBitWidth, CBitHeight );
@ -119,7 +119,7 @@ static LRESULT COMBO_NCCreate(WND* wnd, LPARAM lParam)
if( !(wnd->dwExStyle & WS_EX_NOPARENTNOTIFY) ) if( !(wnd->dwExStyle & WS_EX_NOPARENTNOTIFY) )
lphc->wState |= CBF_NOTIFY; lphc->wState |= CBF_NOTIFY;
TRACE(combo, "[0x%08x], style = %08x\n", TRACE("[0x%08x], style = %08x\n",
(UINT)lphc, lphc->dwStyle ); (UINT)lphc, lphc->dwStyle );
return (LRESULT)(UINT)wnd->hwndSelf; return (LRESULT)(UINT)wnd->hwndSelf;
@ -137,7 +137,7 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc )
{ {
WND* wnd = lphc->self; WND* wnd = lphc->self;
TRACE(combo,"[%04x]: freeing storage\n", CB_HWND(lphc)); TRACE("[%04x]: freeing storage\n", CB_HWND(lphc));
if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox )
DestroyWindow( lphc->hWndLBox ); DestroyWindow( lphc->hWndLBox );
@ -388,13 +388,13 @@ static void CBCalcPlacement(
lprLB->right = lprLB->left + lphc->droppedWidth; lprLB->right = lprLB->left + lphc->droppedWidth;
} }
TRACE(combo,"\ttext\t= (%i,%i-%i,%i)\n", TRACE("\ttext\t= (%i,%i-%i,%i)\n",
lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom); lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom);
TRACE(combo,"\tbutton\t= (%i,%i-%i,%i)\n", TRACE("\tbutton\t= (%i,%i-%i,%i)\n",
lprButton->left, lprButton->top, lprButton->right, lprButton->bottom); lprButton->left, lprButton->top, lprButton->right, lprButton->bottom);
TRACE(combo,"\tlbox\t= (%i,%i-%i,%i)\n", TRACE("\tlbox\t= (%i,%i-%i,%i)\n",
lprLB->left, lprLB->top, lprLB->right, lprLB->bottom ); lprLB->left, lprLB->top, lprLB->right, lprLB->bottom );
} }
@ -597,12 +597,12 @@ static LRESULT COMBO_Create( LPHEADCOMBO lphc, WND* wnd, LPARAM lParam)
CBForceDummyResize(lphc); CBForceDummyResize(lphc);
} }
TRACE(combo,"init done\n"); TRACE("init done\n");
return wnd->hwndSelf; return wnd->hwndSelf;
} }
ERR(combo, "edit control failure.\n"); ERR("edit control failure.\n");
} else ERR(combo, "listbox failure.\n"); } else ERR("listbox failure.\n");
} else ERR(combo, "no owner for visible combo.\n"); } else ERR("no owner for visible combo.\n");
/* CreateWindow() will send WM_NCDESTROY to cleanup */ /* CreateWindow() will send WM_NCDESTROY to cleanup */
@ -970,7 +970,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc )
if( length > 0 ) if( length > 0 )
pText = (LPSTR) HeapAlloc( GetProcessHeap(), 0, length + 1); pText = (LPSTR) HeapAlloc( GetProcessHeap(), 0, length + 1);
TRACE(combo,"\t edit text length %i\n", length ); TRACE("\t edit text length %i\n", length );
if( pText ) if( pText )
{ {
@ -1006,7 +1006,7 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index )
INT length; INT length;
LPSTR pText = NULL; LPSTR pText = NULL;
TRACE(combo,"\t %i\n", index ); TRACE("\t %i\n", index );
if( index == -1 ) if( index == -1 )
{ {
@ -1050,7 +1050,7 @@ static void CBDropDown( LPHEADCOMBO lphc )
INT index; INT index;
RECT rect; RECT rect;
TRACE(combo,"[%04x]: drop down\n", CB_HWND(lphc)); TRACE("[%04x]: drop down\n", CB_HWND(lphc));
CB_NOTIFY( lphc, CBN_DROPDOWN ); CB_NOTIFY( lphc, CBN_DROPDOWN );
@ -1106,7 +1106,7 @@ static void CBRollUp( LPHEADCOMBO lphc, BOOL ok, BOOL bButton )
if( IsWindow( hWnd ) && CB_GETTYPE(lphc) != CBS_SIMPLE ) if( IsWindow( hWnd ) && CB_GETTYPE(lphc) != CBS_SIMPLE )
{ {
TRACE(combo,"[%04x]: roll up [%i]\n", CB_HWND(lphc), (INT)ok ); TRACE("[%04x]: roll up [%i]\n", CB_HWND(lphc), (INT)ok );
/* always send WM_LBUTTONUP? */ /* always send WM_LBUTTONUP? */
SendMessageA( lphc->hWndLBox, WM_LBUTTONUP, 0, (LPARAM)(-1) ); SendMessageA( lphc->hWndLBox, WM_LBUTTONUP, 0, (LPARAM)(-1) );
@ -1252,7 +1252,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
{ {
case (EN_SETFOCUS >> 8): case (EN_SETFOCUS >> 8):
TRACE(combo,"[%04x]: edit [%04x] got focus\n", TRACE("[%04x]: edit [%04x] got focus\n",
CB_HWND(lphc), lphc->hWndEdit ); CB_HWND(lphc), lphc->hWndEdit );
if( !(lphc->wState & CBF_FOCUSED) ) COMBO_SetFocus( lphc ); if( !(lphc->wState & CBF_FOCUSED) ) COMBO_SetFocus( lphc );
@ -1260,7 +1260,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
case (EN_KILLFOCUS >> 8): case (EN_KILLFOCUS >> 8):
TRACE(combo,"[%04x]: edit [%04x] lost focus\n", TRACE("[%04x]: edit [%04x] lost focus\n",
CB_HWND(lphc), lphc->hWndEdit ); CB_HWND(lphc), lphc->hWndEdit );
/* NOTE: it seems that Windows' edit control sends an /* NOTE: it seems that Windows' edit control sends an
@ -1301,7 +1301,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
case LBN_SELCHANGE: case LBN_SELCHANGE:
case LBN_SELCANCEL: case LBN_SELCANCEL:
TRACE(combo,"[%04x]: lbox selection change [%04x]\n", TRACE("[%04x]: lbox selection change [%04x]\n",
CB_HWND(lphc), lphc->wState ); CB_HWND(lphc), lphc->wState );
/* do not roll up if selection is being tracked /* do not roll up if selection is being tracked
@ -1335,7 +1335,7 @@ static LRESULT COMBO_ItemOp( LPHEADCOMBO lphc, UINT msg,
{ {
HWND hWnd = lphc->self->hwndSelf; HWND hWnd = lphc->self->hwndSelf;
TRACE(combo,"[%04x]: ownerdraw op %04x\n", CB_HWND(lphc), msg ); TRACE("[%04x]: ownerdraw op %04x\n", CB_HWND(lphc), msg );
#define lpIS ((LPDELETEITEMSTRUCT)lParam) #define lpIS ((LPDELETEITEMSTRUCT)lParam)
@ -1690,7 +1690,7 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
LPHEADCOMBO lphc = CB_GETPTR(pWnd); LPHEADCOMBO lphc = CB_GETPTR(pWnd);
HWND hwnd = pWnd->hwndSelf; HWND hwnd = pWnd->hwndSelf;
TRACE(combo, "[%04x]: msg %s wp %08x lp %08lx\n", TRACE("[%04x]: msg %s wp %08x lp %08lx\n",
pWnd->hwndSelf, SPY_GetMsgName(message), wParam, lParam ); pWnd->hwndSelf, SPY_GetMsgName(message), wParam, lParam );
if( lphc || message == WM_NCCREATE ) if( lphc || message == WM_NCCREATE )
@ -1964,7 +1964,7 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
case CB_GETEXTENDEDUI: case CB_GETEXTENDEDUI:
return (lphc->wState & CBF_EUI) ? TRUE : FALSE; return (lphc->wState & CBF_EUI) ? TRUE : FALSE;
case (WM_USER + 0x1B): case (WM_USER + 0x1B):
WARN(combo, "[%04x]: undocumented msg!\n", hwnd ); WARN("[%04x]: undocumented msg!\n", hwnd );
} }
return DefWindowProcA(hwnd, message, wParam, lParam); return DefWindowProcA(hwnd, message, wParam, lParam);
} }

44
controls/listbox.c
View file

@ -17,8 +17,8 @@
#include "debugtools.h" #include "debugtools.h"
#include "tweak.h" #include "tweak.h"
DEFAULT_DEBUG_CHANNEL(listbox)
DECLARE_DEBUG_CHANNEL(combo) DECLARE_DEBUG_CHANNEL(combo)
DECLARE_DEBUG_CHANNEL(listbox)
/* Unimplemented yet: /* Unimplemented yet:
* - LBS_NOSEL * - LBS_NOSEL
@ -106,13 +106,13 @@ void LISTBOX_Dump( WND *wnd )
LB_ITEMDATA *item; LB_ITEMDATA *item;
LB_DESCR *descr = *(LB_DESCR **)wnd->wExtra; LB_DESCR *descr = *(LB_DESCR **)wnd->wExtra;
TRACE_(listbox)( "Listbox:\n" ); TRACE( "Listbox:\n" );
TRACE_(listbox)( "hwnd=%04x descr=%08x heap=%08x items=%d top=%d\n", TRACE( "hwnd=%04x descr=%08x heap=%08x items=%d top=%d\n",
wnd->hwndSelf, (UINT)descr, descr->heap, descr->nb_items, wnd->hwndSelf, (UINT)descr, descr->heap, descr->nb_items,
descr->top_item ); descr->top_item );
for (i = 0, item = descr->items; i < descr->nb_items; i++, item++) for (i = 0, item = descr->items; i < descr->nb_items; i++, item++)
{ {
TRACE_(listbox)( "%4d: %-40s %d %08lx %3d\n", TRACE( "%4d: %-40s %d %08lx %3d\n",
i, item->str, item->selected, item->data, item->height ); i, item->str, item->selected, item->data, item->height );
} }
} }
@ -324,7 +324,7 @@ static void LISTBOX_UpdateSize( WND *wnd, LB_DESCR *descr )
if ((descr->height > descr->item_height) && if ((descr->height > descr->item_height) &&
(descr->height % descr->item_height)) (descr->height % descr->item_height))
{ {
TRACE_(listbox)("[%04x]: changing height %d -> %d\n", TRACE("[%04x]: changing height %d -> %d\n",
wnd->hwndSelf, descr->height, wnd->hwndSelf, descr->height,
descr->height - descr->height%descr->item_height ); descr->height - descr->height%descr->item_height );
SetWindowPos( wnd->hwndSelf, 0, 0, 0, SetWindowPos( wnd->hwndSelf, 0, 0, 0,
@ -335,7 +335,7 @@ static void LISTBOX_UpdateSize( WND *wnd, LB_DESCR *descr )
return; return;
} }
} }
TRACE_(listbox)("[%04x]: new size = %d,%d\n", TRACE("[%04x]: new size = %d,%d\n",
wnd->hwndSelf, descr->width, descr->height ); wnd->hwndSelf, descr->width, descr->height );
LISTBOX_UpdatePage( wnd, descr ); LISTBOX_UpdatePage( wnd, descr );
LISTBOX_UpdateScroll( wnd, descr ); LISTBOX_UpdateScroll( wnd, descr );
@ -464,7 +464,7 @@ static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC hdc,
if (action == ODA_FOCUS) if (action == ODA_FOCUS)
DrawFocusRect( hdc, rect ); DrawFocusRect( hdc, rect );
else else
FIXME_(listbox)("called with an out of bounds index %d(%d) in owner draw, Not good.\n",index,descr->nb_items); FIXME("called with an out of bounds index %d(%d) in owner draw, Not good.\n",index,descr->nb_items);
return; return;
} }
dis.CtlType = ODT_LISTBOX; dis.CtlType = ODT_LISTBOX;
@ -481,7 +481,7 @@ static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC hdc,
if (wnd->dwStyle & WS_DISABLED) dis.itemState |= ODS_DISABLED; if (wnd->dwStyle & WS_DISABLED) dis.itemState |= ODS_DISABLED;
dis.itemData = item ? item->data : 0; dis.itemData = item ? item->data : 0;
dis.rcItem = *rect; dis.rcItem = *rect;
TRACE_(listbox)("[%04x]: drawitem %d (%s) action=%02x " TRACE("[%04x]: drawitem %d (%s) action=%02x "
"state=%02x rect=%d,%d-%d,%d\n", "state=%02x rect=%d,%d-%d,%d\n",
wnd->hwndSelf, index, item ? item->str : "", action, wnd->hwndSelf, index, item ? item->str : "", action,
dis.itemState, rect->left, rect->top, dis.itemState, rect->left, rect->top,
@ -503,7 +503,7 @@ static void LISTBOX_PaintItem( WND *wnd, LB_DESCR *descr, HDC hdc,
oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
} }
TRACE_(listbox)("[%04x]: painting %d (%s) action=%02x " TRACE("[%04x]: painting %d (%s) action=%02x "
"rect=%d,%d-%d,%d\n", "rect=%d,%d-%d,%d\n",
wnd->hwndSelf, index, item ? item->str : "", action, wnd->hwndSelf, index, item ? item->str : "", action,
rect->left, rect->top, rect->right, rect->bottom ); rect->left, rect->top, rect->right, rect->bottom );
@ -635,7 +635,7 @@ static BOOL LISTBOX_SetTabStops( WND *wnd, LB_DESCR *descr, INT count,
if(TRACE_ON(listbox)) if(TRACE_ON(listbox))
dsprintf(listbox, "%hd ", descr->tabs[i]); dsprintf(listbox, "%hd ", descr->tabs[i]);
} }
TRACE_(listbox)("[%04x]: settabstops %s\n", TRACE("[%04x]: settabstops %s\n",
wnd->hwndSelf, dbg_str(listbox)); wnd->hwndSelf, dbg_str(listbox));
} }
else memcpy( descr->tabs, tabs, descr->nb_tabs * sizeof(INT) ); else memcpy( descr->tabs, tabs, descr->nb_tabs * sizeof(INT) );
@ -1015,7 +1015,7 @@ static LRESULT LISTBOX_SetItemHeight( WND *wnd, LB_DESCR *descr, INT index,
if (descr->style & LBS_OWNERDRAWVARIABLE) if (descr->style & LBS_OWNERDRAWVARIABLE)
{ {
if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR;
TRACE_(listbox)("[%04x]: item %d height = %d\n", TRACE("[%04x]: item %d height = %d\n",
wnd->hwndSelf, index, height ); wnd->hwndSelf, index, height );
descr->items[index].height = height; descr->items[index].height = height;
LISTBOX_UpdateScroll( wnd, descr ); LISTBOX_UpdateScroll( wnd, descr );
@ -1023,7 +1023,7 @@ static LRESULT LISTBOX_SetItemHeight( WND *wnd, LB_DESCR *descr, INT index,
} }
else if (height != descr->item_height) else if (height != descr->item_height)
{ {
TRACE_(listbox)("[%04x]: new height = %d\n", TRACE("[%04x]: new height = %d\n",
wnd->hwndSelf, height ); wnd->hwndSelf, height );
descr->item_height = height; descr->item_height = height;
LISTBOX_UpdatePage( wnd, descr ); LISTBOX_UpdatePage( wnd, descr );
@ -1045,7 +1045,7 @@ static void LISTBOX_SetHorizontalPos( WND *wnd, LB_DESCR *descr, INT pos )
pos = descr->horz_extent - descr->width; pos = descr->horz_extent - descr->width;
if (pos < 0) pos = 0; if (pos < 0) pos = 0;
if (!(diff = descr->horz_pos - pos)) return; if (!(diff = descr->horz_pos - pos)) return;
TRACE_(listbox)("[%04x]: new horz pos = %d\n", TRACE("[%04x]: new horz pos = %d\n",
wnd->hwndSelf, pos ); wnd->hwndSelf, pos );
descr->horz_pos = pos; descr->horz_pos = pos;
LISTBOX_UpdateScroll( wnd, descr ); LISTBOX_UpdateScroll( wnd, descr );
@ -1067,7 +1067,7 @@ static LRESULT LISTBOX_SetHorizontalExtent( WND *wnd, LB_DESCR *descr,
return LB_OKAY; return LB_OKAY;
if (extent <= 0) extent = 1; if (extent <= 0) extent = 1;
if (extent == descr->horz_extent) return LB_OKAY; if (extent == descr->horz_extent) return LB_OKAY;
TRACE_(listbox)("[%04x]: new horz extent = %d\n", TRACE("[%04x]: new horz extent = %d\n",
wnd->hwndSelf, extent ); wnd->hwndSelf, extent );
descr->horz_extent = extent; descr->horz_extent = extent;
if (descr->horz_pos > extent - descr->width) if (descr->horz_pos > extent - descr->width)
@ -1085,7 +1085,7 @@ static LRESULT LISTBOX_SetColumnWidth( WND *wnd, LB_DESCR *descr, UINT width)
{ {
width += 2; /* For left and right margin */ width += 2; /* For left and right margin */
if (width == descr->column_width) return LB_OKAY; if (width == descr->column_width) return LB_OKAY;
TRACE_(listbox)("[%04x]: new column width = %d\n", TRACE("[%04x]: new column width = %d\n",
wnd->hwndSelf, width ); wnd->hwndSelf, width );
descr->column_width = width; descr->column_width = width;
LISTBOX_UpdatePage( wnd, descr ); LISTBOX_UpdatePage( wnd, descr );
@ -1108,7 +1108,7 @@ static INT LISTBOX_SetFont( WND *wnd, LB_DESCR *descr, HFONT font )
if (!(hdc = GetDCEx( wnd->hwndSelf, 0, DCX_CACHE ))) if (!(hdc = GetDCEx( wnd->hwndSelf, 0, DCX_CACHE )))
{ {
ERR_(listbox)("unable to get DC.\n" ); ERR("unable to get DC.\n" );
return 16; return 16;
} }
if (font) oldFont = SelectObject( hdc, font ); if (font) oldFont = SelectObject( hdc, font );
@ -1340,7 +1340,7 @@ static LRESULT LISTBOX_InsertItem( WND *wnd, LB_DESCR *descr, INT index,
mis.itemHeight = descr->item_height; mis.itemHeight = descr->item_height;
SendMessageA( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); SendMessageA( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis );
item->height = mis.itemHeight ? mis.itemHeight : 1; item->height = mis.itemHeight ? mis.itemHeight : 1;
TRACE_(listbox)("[%04x]: measure item %d (%s) = %d\n", TRACE("[%04x]: measure item %d (%s) = %d\n",
wnd->hwndSelf, index, str ? str : "", item->height ); wnd->hwndSelf, index, str ? str : "", item->height );
} }
@ -1392,7 +1392,7 @@ static LRESULT LISTBOX_InsertString( WND *wnd, LB_DESCR *descr, INT index,
return ret; return ret;
} }
TRACE_(listbox)("[%04x]: added item %d '%s'\n", TRACE("[%04x]: added item %d '%s'\n",
wnd->hwndSelf, index, HAS_STRINGS(descr) ? new_str : "" ); wnd->hwndSelf, index, HAS_STRINGS(descr) ? new_str : "" );
return index; return index;
} }
@ -1729,7 +1729,7 @@ static LRESULT LISTBOX_HandleLButtonDown( WND *wnd, LB_DESCR *descr,
WPARAM wParam, INT x, INT y ) WPARAM wParam, INT x, INT y )
{ {
INT index = LISTBOX_GetItemFromPoint( wnd, descr, x, y ); INT index = LISTBOX_GetItemFromPoint( wnd, descr, x, y );
TRACE_(listbox)("[%04x]: lbuttondown %d,%d item %d\n", TRACE("[%04x]: lbuttondown %d,%d item %d\n",
wnd->hwndSelf, x, y, index ); wnd->hwndSelf, x, y, index );
if (!descr->caret_on && (GetFocus() == wnd->hwndSelf)) return 0; if (!descr->caret_on && (GetFocus() == wnd->hwndSelf)) return 0;
if (index != -1) if (index != -1)
@ -2146,7 +2146,7 @@ static inline LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
{ {
if (!LISTBOX_Create( wnd, NULL )) if (!LISTBOX_Create( wnd, NULL ))
return -1; return -1;
TRACE_(listbox)("creating wnd=%04x descr=%p\n", TRACE("creating wnd=%04x descr=%p\n",
hwnd, *(LB_DESCR **)wnd->wExtra ); hwnd, *(LB_DESCR **)wnd->wExtra );
return 0; return 0;
} }
@ -2154,7 +2154,7 @@ static inline LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
return DefWindowProcA( hwnd, msg, wParam, lParam ); return DefWindowProcA( hwnd, msg, wParam, lParam );
} }
TRACE_(listbox)("[%04x]: msg %s wp %08x lp %08lx\n", TRACE("[%04x]: msg %s wp %08x lp %08lx\n",
wnd->hwndSelf, SPY_GetMsgName(msg), wParam, lParam ); wnd->hwndSelf, SPY_GetMsgName(msg), wParam, lParam );
switch(msg) switch(msg)
{ {
@ -2531,7 +2531,7 @@ static inline LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
return DefWindowProcA( hwnd, msg, wParam, lParam ); return DefWindowProcA( hwnd, msg, wParam, lParam );
default: default:
if ((msg >= WM_USER) && (msg < 0xc000)) if ((msg >= WM_USER) && (msg < 0xc000))
WARN_(listbox)("[%04x]: unknown msg %04x wp %08x lp %08lx\n", WARN("[%04x]: unknown msg %04x wp %08x lp %08lx\n",
hwnd, msg, wParam, lParam ); hwnd, msg, wParam, lParam );
return DefWindowProcA( hwnd, msg, wParam, lParam ); return DefWindowProcA( hwnd, msg, wParam, lParam );
} }

170
controls/menu.c
View file

@ -30,7 +30,7 @@
#include "resource.h" #include "resource.h"
#include "tweak.h" #include "tweak.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(menu) DEFAULT_DEBUG_CHANNEL(menu)
@ -261,7 +261,7 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
dsprintf(menu, "NULL"); dsprintf(menu, "NULL");
} }
TRACE(menu, "%s %s %s\n", prefix, dbg_str(menu), postfix); TRACE("%s %s %s\n", prefix, dbg_str(menu), postfix);
} }
#undef MENUOUT #undef MENUOUT
@ -283,10 +283,10 @@ static HMENU MENU_CopySysPopup(void)
} }
else { else {
hMenu = 0; hMenu = 0;
ERR(menu, "Unable to load default system menu\n" ); ERR("Unable to load default system menu\n" );
} }
TRACE(menu, "returning %x.\n", hMenu ); TRACE("returning %x.\n", hMenu );
return hMenu; return hMenu;
} }
@ -355,12 +355,12 @@ HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu )
menu = (POPUPMENU*) USER_HEAP_LIN_ADDR(hPopupMenu); menu = (POPUPMENU*) USER_HEAP_LIN_ADDR(hPopupMenu);
menu->wFlags |= MF_SYSMENU; menu->wFlags |= MF_SYSMENU;
TRACE(menu,"GetSysMenu hMenu=%04x (%04x)\n", hMenu, hPopupMenu ); TRACE("GetSysMenu hMenu=%04x (%04x)\n", hMenu, hPopupMenu );
return hMenu; return hMenu;
} }
DestroyMenu( hMenu ); DestroyMenu( hMenu );
} }
ERR(menu, "failed to load system menu!\n"); ERR("failed to load system menu!\n");
return 0; return 0;
} }
@ -526,7 +526,7 @@ static UINT MENU_GetStartOfPrevColumn(
break; break;
} }
TRACE(menu, "ret %d.\n", i ); TRACE("ret %d.\n", i );
return i; return i;
} }
@ -624,7 +624,7 @@ static MENUITEM *MENU_FindItemByCoords( POPUPMENU *menu,
static UINT MENU_FindItemByKey( HWND hwndOwner, HMENU hmenu, static UINT MENU_FindItemByKey( HWND hwndOwner, HMENU hmenu,
UINT key, BOOL forceMenuChar ) UINT key, BOOL forceMenuChar )
{ {
TRACE(menu,"\tlooking for '%c' in [%04x]\n", (char)key, (UINT16)hmenu ); TRACE("\tlooking for '%c' in [%04x]\n", (char)key, (UINT16)hmenu );
if (!IsMenu( hmenu )) if (!IsMenu( hmenu ))
{ {
@ -700,7 +700,7 @@ static HBITMAP MENU_LoadMagicItem(UINT id, BOOL hilite, DWORD dwItemData)
case HBMMENU_POPUP_MAXIMIZE: case HBMMENU_POPUP_MAXIMIZE:
case HBMMENU_POPUP_MINIMIZE: case HBMMENU_POPUP_MINIMIZE:
default: default:
FIXME(menu,"Magic 0x%08x not implemented\n", id); FIXME("Magic 0x%08x not implemented\n", id);
return 0; return 0;
} }
@ -716,7 +716,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
{ {
char *p; char *p;
TRACE(menu, "dc=0x%04x owner=0x%04x (%d,%d)\n", hdc, hwndOwner, orgX, orgY); TRACE("dc=0x%04x owner=0x%04x (%d,%d)\n", hdc, hwndOwner, orgX, orgY);
debug_print_menuitem("MENU_CalcItemSize: menuitem:", lpitem, debug_print_menuitem("MENU_CalcItemSize: menuitem:", lpitem,
(menuBar ? " (MenuBar)" : "")); (menuBar ? " (MenuBar)" : ""));
@ -734,7 +734,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
SendMessageA( hwndOwner, WM_MEASUREITEM, 0, (LPARAM)&mis ); SendMessageA( hwndOwner, WM_MEASUREITEM, 0, (LPARAM)&mis );
lpitem->rect.bottom += mis.itemHeight; lpitem->rect.bottom += mis.itemHeight;
lpitem->rect.right += mis.itemWidth; lpitem->rect.right += mis.itemWidth;
TRACE(menu, "id=%04x size=%dx%d\n", TRACE("id=%04x size=%dx%d\n",
lpitem->wID, mis.itemWidth, mis.itemHeight); lpitem->wID, mis.itemWidth, mis.itemHeight);
return; return;
} }
@ -807,7 +807,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
- arrow_bitmap_width; - arrow_bitmap_width;
} }
} }
TRACE(menu,"(%d,%d)-(%d,%d)\n", lpitem->rect.left, lpitem->rect.top, lpitem->rect.right, lpitem->rect.bottom); TRACE("(%d,%d)-(%d,%d)\n", lpitem->rect.left, lpitem->rect.top, lpitem->rect.right, lpitem->rect.bottom);
} }
@ -900,7 +900,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect,
if ((lprect == NULL) || (lppop == NULL)) return; if ((lprect == NULL) || (lppop == NULL)) return;
if (lppop->nItems == 0) return; if (lppop->nItems == 0) return;
TRACE(menu,"left=%d top=%d right=%d bottom=%d\n", TRACE("left=%d top=%d right=%d bottom=%d\n",
lprect->left, lprect->top, lprect->right, lprect->bottom); lprect->left, lprect->top, lprect->right, lprect->bottom);
lppop->Width = lprect->right - lprect->left; lppop->Width = lprect->right - lprect->left;
lppop->Height = 0; lppop->Height = 0;
@ -920,7 +920,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect,
if ((i != start) && if ((i != start) &&
(lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break; (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break;
TRACE(menu, "calling MENU_CalcItemSize org=(%d, %d)\n", TRACE("calling MENU_CalcItemSize org=(%d, %d)\n",
orgX, orgY ); orgX, orgY );
debug_print_menuitem (" item: ", lpitem, ""); debug_print_menuitem (" item: ", lpitem, "");
MENU_CalcItemSize( hdc, lpitem, hwndOwner, orgX, orgY, TRUE ); MENU_CalcItemSize( hdc, lpitem, hwndOwner, orgX, orgY, TRUE );
@ -1002,7 +1002,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
dis.hwndItem = hmenu; dis.hwndItem = hmenu;
dis.hDC = hdc; dis.hDC = hdc;
dis.rcItem = lpitem->rect; dis.rcItem = lpitem->rect;
TRACE(menu, "Ownerdraw: owner=%04x itemID=%d, itemState=%d, itemAction=%d, " TRACE("Ownerdraw: owner=%04x itemID=%d, itemState=%d, itemAction=%d, "
"hwndItem=%04x, hdc=%04x, rcItem={%d,%d,%d,%d}\n", hwndOwner, "hwndItem=%04x, hdc=%04x, rcItem={%d,%d,%d,%d}\n", hwndOwner,
dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem,
dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right, dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right,
@ -1011,7 +1011,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
return; return;
} }
TRACE(menu, "rect={%d,%d,%d,%d}\n", lpitem->rect.left, lpitem->rect.top, TRACE("rect={%d,%d,%d,%d}\n", lpitem->rect.left, lpitem->rect.top,
lpitem->rect.right,lpitem->rect.bottom); lpitem->rect.right,lpitem->rect.bottom);
if (menuBar && (lpitem->fType & MF_SEPARATOR)) return; if (menuBar && (lpitem->fType & MF_SEPARATOR)) return;
@ -1266,7 +1266,7 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
HBRUSH hPrevBrush = 0; HBRUSH hPrevBrush = 0;
RECT rect; RECT rect;
TRACE(menu,"wnd=0x%04x dc=0x%04x menu=0x%04x\n", hwnd, hdc, hmenu); TRACE("wnd=0x%04x dc=0x%04x menu=0x%04x\n", hwnd, hdc, hmenu);
GetClientRect( hwnd, &rect ); GetClientRect( hwnd, &rect );
@ -1353,7 +1353,7 @@ UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd,
goto END; goto END;
} }
TRACE(menu,"(%04x, %p, %p)\n", hDC, lprect, lppop); TRACE("(%04x, %p, %p)\n", hDC, lprect, lppop);
hfontOld = SelectObject( hDC, hMenuFont); hfontOld = SelectObject( hDC, hMenuFont);
@ -1415,7 +1415,7 @@ BOOL MENU_PatchResidentPopup( HQUEUE16 checkQueue, WND* checkWnd )
{ {
HTASK16 hTask = 0; HTASK16 hTask = 0;
TRACE(menu,"patching resident popup: %04x %04x [%04x %04x]\n", TRACE("patching resident popup: %04x %04x [%04x %04x]\n",
checkQueue, checkWnd ? checkWnd->hwndSelf : 0, pTPWnd->hmemTaskQ, checkQueue, checkWnd ? checkWnd->hwndSelf : 0, pTPWnd->hmemTaskQ,
pTPWnd->owner ? pTPWnd->owner->hwndSelf : 0); pTPWnd->owner ? pTPWnd->owner->hwndSelf : 0);
@ -1455,7 +1455,7 @@ BOOL MENU_PatchResidentPopup( HQUEUE16 checkQueue, WND* checkWnd )
MENU_ReleaseTopPopupWnd(); MENU_ReleaseTopPopupWnd();
return TRUE; return TRUE;
} }
else WARN(menu,"failed to patch resident popup.\n"); else WARN("failed to patch resident popup.\n");
} }
} }
MENU_ReleaseTopPopupWnd(); MENU_ReleaseTopPopupWnd();
@ -1473,7 +1473,7 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id,
POPUPMENU *menu; POPUPMENU *menu;
WND *wndOwner = NULL; WND *wndOwner = NULL;
TRACE(menu,"owner=0x%04x hmenu=0x%04x id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n", TRACE("owner=0x%04x hmenu=0x%04x id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n",
hwndOwner, hmenu, id, x, y, xanchor, yanchor); hwndOwner, hmenu, id, x, y, xanchor, yanchor);
if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu ))) return FALSE; if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu ))) return FALSE;
@ -1591,7 +1591,7 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex,
LPPOPUPMENU lppop; LPPOPUPMENU lppop;
HDC hdc; HDC hdc;
TRACE(menu, "owner=0x%04x menu=0x%04x index=0x%04x select=0x%04x\n", hwndOwner, hmenu, wIndex, sendMenuSelect); TRACE("owner=0x%04x menu=0x%04x index=0x%04x select=0x%04x\n", hwndOwner, hmenu, wIndex, sendMenuSelect);
lppop = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu ); lppop = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu );
if (!lppop->nItems) return; if (!lppop->nItems) return;
@ -1650,7 +1650,7 @@ static void MENU_MoveSelection( HWND hwndOwner, HMENU hmenu, INT offset )
INT i; INT i;
POPUPMENU *menu; POPUPMENU *menu;
TRACE(menu,"hwnd=0x%04x hmenu=0x%04x off=0x%04x\n", hwndOwner, hmenu, offset); TRACE("hwnd=0x%04x hmenu=0x%04x off=0x%04x\n", hwndOwner, hmenu, offset);
menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu ); menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu );
if (!menu->items) return; if (!menu->items) return;
@ -1770,7 +1770,7 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags )
if (!(menu = (POPUPMENU *)USER_HEAP_LIN_ADDR(hMenu))) if (!(menu = (POPUPMENU *)USER_HEAP_LIN_ADDR(hMenu)))
{ {
WARN(menu, "%04x not a menu handle\n", WARN("%04x not a menu handle\n",
hMenu ); hMenu );
return NULL; return NULL;
} }
@ -1788,13 +1788,13 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags )
{ {
if (!MENU_FindItem( &hMenu, &pos, flags )) if (!MENU_FindItem( &hMenu, &pos, flags ))
{ {
WARN(menu, "item %x not found\n", WARN("item %x not found\n",
pos ); pos );
return NULL; return NULL;
} }
if (!(menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu))) if (!(menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu)))
{ {
WARN(menu,"%04x not a menu handle\n", WARN("%04x not a menu handle\n",
hMenu); hMenu);
return NULL; return NULL;
} }
@ -1805,7 +1805,7 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags )
newItems = HeapAlloc( SystemHeap, 0, sizeof(MENUITEM) * (menu->nItems+1) ); newItems = HeapAlloc( SystemHeap, 0, sizeof(MENUITEM) * (menu->nItems+1) );
if (!newItems) if (!newItems)
{ {
WARN(menu, "allocation failed\n" ); WARN("allocation failed\n" );
return NULL; return NULL;
} }
if (menu->nItems > 0) if (menu->nItems > 0)
@ -1844,7 +1844,7 @@ static LPCSTR MENU_ParseResource( LPCSTR res, HMENU hMenu, BOOL unicode )
res += sizeof(WORD); res += sizeof(WORD);
} }
if (!IS_STRING_ITEM(flags)) if (!IS_STRING_ITEM(flags))
ERR(menu, "not a string item %04x\n", flags ); ERR("not a string item %04x\n", flags );
str = res; str = res;
if (!unicode) res += strlen(str) + 1; if (!unicode) res += strlen(str) + 1;
else res += (lstrlenW((LPCWSTR)str) + 1) * sizeof(WCHAR); else res += (lstrlenW((LPCWSTR)str) + 1) * sizeof(WCHAR);
@ -1901,7 +1901,7 @@ static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU hMenu)
{ {
LPSTR newstr = HEAP_strdupWtoA(GetProcessHeap(), LPSTR newstr = HEAP_strdupWtoA(GetProcessHeap(),
0, mii.dwTypeData); 0, mii.dwTypeData);
TRACE(menu, "Menu item: [%08x,%08x,%04x,%04x,%s]\n", TRACE("Menu item: [%08x,%08x,%04x,%04x,%s]\n",
mii.fType, mii.fState, mii.wID, resinfo, newstr); mii.fType, mii.fState, mii.wID, resinfo, newstr);
HeapFree( GetProcessHeap(), 0, newstr ); HeapFree( GetProcessHeap(), 0, newstr );
} }
@ -1956,7 +1956,7 @@ static void MENU_HideSubPopups( HWND hwndOwner, HMENU hmenu,
{ {
POPUPMENU *menu = (POPUPMENU*) USER_HEAP_LIN_ADDR( hmenu );; POPUPMENU *menu = (POPUPMENU*) USER_HEAP_LIN_ADDR( hmenu );;
TRACE(menu,"owner=0x%04x hmenu=0x%04x 0x%04x\n", hwndOwner, hmenu, sendMenuSelect); TRACE("owner=0x%04x hmenu=0x%04x 0x%04x\n", hwndOwner, hmenu, sendMenuSelect);
if (menu && uSubPWndLevel) if (menu && uSubPWndLevel)
{ {
@ -2007,7 +2007,7 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu,
WND *wndPtr; WND *wndPtr;
HDC hdc; HDC hdc;
TRACE(menu,"owner=0x%04x hmenu=0x%04x 0x%04x\n", hwndOwner, hmenu, selectFirst); TRACE("owner=0x%04x hmenu=0x%04x 0x%04x\n", hwndOwner, hmenu, selectFirst);
if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu ))) return hmenu; if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hmenu ))) return hmenu;
@ -2132,14 +2132,14 @@ static INT MENU_ExecFocusedItem( MTRACKER* pmt, HMENU hMenu )
MENUITEM *item; MENUITEM *item;
POPUPMENU *menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hMenu ); POPUPMENU *menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hMenu );
TRACE(menu,"%p hmenu=0x%04x\n", pmt, hMenu); TRACE("%p hmenu=0x%04x\n", pmt, hMenu);
if (!menu || !menu->nItems || if (!menu || !menu->nItems ||
(menu->FocusedItem == NO_SELECTED_ITEM)) return 0; (menu->FocusedItem == NO_SELECTED_ITEM)) return 0;
item = &menu->items[menu->FocusedItem]; item = &menu->items[menu->FocusedItem];
TRACE(menu, "%08x %08x %08x\n", TRACE("%08x %08x %08x\n",
hMenu, item->wID, item->hSubMenu); hMenu, item->wID, item->hSubMenu);
if (!(item->fType & MF_POPUP)) if (!(item->fType & MF_POPUP))
@ -2176,7 +2176,7 @@ static void MENU_SwitchTracking( MTRACKER* pmt, HMENU hPtMenu, UINT id )
POPUPMENU *ptmenu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hPtMenu ); POPUPMENU *ptmenu = (POPUPMENU *) USER_HEAP_LIN_ADDR( hPtMenu );
POPUPMENU *topmenu = (POPUPMENU *) USER_HEAP_LIN_ADDR( pmt->hTopMenu ); POPUPMENU *topmenu = (POPUPMENU *) USER_HEAP_LIN_ADDR( pmt->hTopMenu );
TRACE(menu,"%p hmenu=0x%04x 0x%04x\n", pmt, hPtMenu, id); TRACE("%p hmenu=0x%04x 0x%04x\n", pmt, hPtMenu, id);
if( pmt->hTopMenu != hPtMenu && if( pmt->hTopMenu != hPtMenu &&
!((ptmenu->wFlags | topmenu->wFlags) & MF_POPUP) ) !((ptmenu->wFlags | topmenu->wFlags) & MF_POPUP) )
@ -2199,7 +2199,7 @@ static void MENU_SwitchTracking( MTRACKER* pmt, HMENU hPtMenu, UINT id )
*/ */
static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu ) static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu )
{ {
TRACE(menu,"%p hmenu=0x%04x\n", pmt, hPtMenu); TRACE("%p hmenu=0x%04x\n", pmt, hPtMenu);
if (hPtMenu) if (hPtMenu)
{ {
@ -2239,7 +2239,7 @@ static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu )
pmt->hCurrentMenu = MENU_ShowSubPopup( pmt->hOwnerWnd, hPtMenu, FALSE ); pmt->hCurrentMenu = MENU_ShowSubPopup( pmt->hOwnerWnd, hPtMenu, FALSE );
return TRUE; return TRUE;
} }
else WARN(menu, "\tunable to find clicked item!\n"); else WARN("\tunable to find clicked item!\n");
} }
return FALSE; return FALSE;
} }
@ -2255,7 +2255,7 @@ static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu )
*/ */
static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu ) static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu )
{ {
TRACE(menu,"%p hmenu=0x%04x\n", pmt, hPtMenu); TRACE("%p hmenu=0x%04x\n", pmt, hPtMenu);
if (hPtMenu) if (hPtMenu)
{ {
@ -2339,7 +2339,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk )
LRESULT l = SendMessageA( pmt->hOwnerWnd, WM_NEXTMENU, vk, LRESULT l = SendMessageA( pmt->hOwnerWnd, WM_NEXTMENU, vk,
(IS_SYSTEM_MENU(menu)) ? GetSubMenu16(pmt->hTopMenu,0) : pmt->hTopMenu ); (IS_SYSTEM_MENU(menu)) ? GetSubMenu16(pmt->hTopMenu,0) : pmt->hTopMenu );
TRACE(menu,"%04x [%04x] -> %04x [%04x]\n", TRACE("%04x [%04x] -> %04x [%04x]\n",
(UINT16)pmt->hCurrentMenu, (UINT16)pmt->hOwnerWnd, LOWORD(l), HIWORD(l) ); (UINT16)pmt->hCurrentMenu, (UINT16)pmt->hOwnerWnd, LOWORD(l), HIWORD(l) );
if( l == 0 ) if( l == 0 )
@ -2395,7 +2395,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk )
/* FIXME: Not sure what to do here, perhaps, /* FIXME: Not sure what to do here, perhaps,
* try to track hNewMenu as a popup? */ * try to track hNewMenu as a popup? */
TRACE(menu," -- got confused.\n"); TRACE(" -- got confused.\n");
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
return FALSE; return FALSE;
} }
@ -2528,7 +2528,7 @@ static void MENU_KeyRight( MTRACKER* pmt )
POPUPMENU *menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( pmt->hTopMenu ); POPUPMENU *menu = (POPUPMENU *) USER_HEAP_LIN_ADDR( pmt->hTopMenu );
UINT nextcol; UINT nextcol;
TRACE(menu, "MENU_KeyRight called, cur %x (%s), top %x (%s).\n", TRACE("MENU_KeyRight called, cur %x (%s), top %x (%s).\n",
pmt->hCurrentMenu, pmt->hCurrentMenu,
((POPUPMENU *)USER_HEAP_LIN_ADDR(pmt->hCurrentMenu))-> ((POPUPMENU *)USER_HEAP_LIN_ADDR(pmt->hCurrentMenu))->
items[0].text, items[0].text,
@ -2548,7 +2548,7 @@ static void MENU_KeyRight( MTRACKER* pmt )
/* Check to see if there's another column */ /* Check to see if there's another column */
if( (nextcol = MENU_GetStartOfNextColumn( pmt->hCurrentMenu )) != if( (nextcol = MENU_GetStartOfNextColumn( pmt->hCurrentMenu )) !=
NO_SELECTED_ITEM ) { NO_SELECTED_ITEM ) {
TRACE(menu, "Going to %d.\n", nextcol ); TRACE("Going to %d.\n", nextcol );
MENU_SelectItem( pmt->hOwnerWnd, pmt->hCurrentMenu, MENU_SelectItem( pmt->hOwnerWnd, pmt->hCurrentMenu,
nextcol, TRUE ); nextcol, TRUE );
return; return;
@ -2594,7 +2594,7 @@ static INT MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
mt.pt.x = x; mt.pt.x = x;
mt.pt.y = y; mt.pt.y = y;
TRACE(menu,"hmenu=0x%04x flags=0x%08x (%d,%d) hwnd=0x%04x (%d,%d)-(%d,%d)\n", TRACE("hmenu=0x%04x flags=0x%08x (%d,%d) hwnd=0x%04x (%d,%d)-(%d,%d)\n",
hmenu, wFlags, x, y, hwnd, (lprect) ? lprect->left : 0, (lprect) ? lprect->top : 0, hmenu, wFlags, x, y, hwnd, (lprect) ? lprect->left : 0, (lprect) ? lprect->top : 0,
(lprect) ? lprect->right : 0, (lprect) ? lprect->bottom : 0); (lprect) ? lprect->right : 0, (lprect) ? lprect->bottom : 0);
@ -2802,7 +2802,7 @@ static INT MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup) static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup)
{ {
TRACE(menu, "hwnd=0x%04x hmenu=0x%04x\n", hWnd, hMenu); TRACE("hwnd=0x%04x hmenu=0x%04x\n", hWnd, hMenu);
HideCaret(0); HideCaret(0);
SendMessageA( hWnd, WM_ENTERMENULOOP, bPopup, 0 ); SendMessageA( hWnd, WM_ENTERMENULOOP, bPopup, 0 );
@ -2815,7 +2815,7 @@ static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup)
*/ */
static BOOL MENU_ExitTracking(HWND hWnd) static BOOL MENU_ExitTracking(HWND hWnd)
{ {
TRACE(menu, "hwnd=0x%04x\n", hWnd); TRACE("hwnd=0x%04x\n", hWnd);
SendMessageA( hWnd, WM_EXITMENULOOP, 0, 0 ); SendMessageA( hWnd, WM_EXITMENULOOP, 0, 0 );
ShowCaret(0); ShowCaret(0);
@ -2832,7 +2832,7 @@ void MENU_TrackMouseMenuBar( WND* wndPtr, INT ht, POINT pt )
HWND hWnd = wndPtr->hwndSelf; HWND hWnd = wndPtr->hwndSelf;
HMENU hMenu = (ht == HTSYSMENU) ? wndPtr->hSysMenu : wndPtr->wIDmenu; HMENU hMenu = (ht == HTSYSMENU) ? wndPtr->hSysMenu : wndPtr->wIDmenu;
TRACE(menu,"pwnd=%p ht=0x%04x (%ld,%ld)\n", wndPtr, ht, pt.x, pt.y); TRACE("pwnd=%p ht=0x%04x (%ld,%ld)\n", wndPtr, ht, pt.x, pt.y);
if (IsMenu(hMenu)) if (IsMenu(hMenu))
{ {
@ -2941,7 +2941,7 @@ BOOL WINAPI TrackPopupMenu( HMENU hMenu, UINT wFlags, INT x, INT y,
BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y,
HWND hWnd, LPTPMPARAMS lpTpm ) HWND hWnd, LPTPMPARAMS lpTpm )
{ {
FIXME(menu, "not fully implemented\n" ); FIXME("not fully implemented\n" );
return TrackPopupMenu( hMenu, wFlags, x, y, 0, hWnd, return TrackPopupMenu( hMenu, wFlags, x, y, 0, hWnd,
lpTpm ? &lpTpm->rcExclude : NULL ); lpTpm ? &lpTpm->rcExclude : NULL );
} }
@ -2957,7 +2957,7 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
WND* wndPtr = WIN_FindWndPtr(hwnd); WND* wndPtr = WIN_FindWndPtr(hwnd);
LRESULT retvalue; LRESULT retvalue;
TRACE(menu,"hwnd=0x%04x msg=0x%04x wp=0x%04x lp=0x%08lx\n", TRACE("hwnd=0x%04x msg=0x%04x wp=0x%04x lp=0x%08lx\n",
hwnd, message, wParam, lParam); hwnd, message, wParam, lParam);
switch(message) switch(message)
@ -2997,7 +2997,7 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
{ {
if( hwnd == pTopPopupWnd->hwndSelf ) if( hwnd == pTopPopupWnd->hwndSelf )
{ {
ERR(menu, "resident popup destroyed!\n"); ERR("resident popup destroyed!\n");
MENU_DestroyTopPopupWnd(); MENU_DestroyTopPopupWnd();
uSubPWndLevel = 0; uSubPWndLevel = 0;
@ -3013,7 +3013,7 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
if( wParam ) if( wParam )
{ {
if( !(*(HMENU*)wndPtr->wExtra) ) if( !(*(HMENU*)wndPtr->wExtra) )
ERR(menu,"no menu to display\n"); ERR("no menu to display\n");
} }
else else
*(HMENU*)wndPtr->wExtra = 0; *(HMENU*)wndPtr->wExtra = 0;
@ -3054,7 +3054,7 @@ UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth,
LPPOPUPMENU lppop; LPPOPUPMENU lppop;
UINT retvalue; UINT retvalue;
TRACE(menu, "HWND 0x%x, width %d, at (%d, %d).\n", TRACE("HWND 0x%x, width %d, at (%d, %d).\n",
hwnd, menubarWidth, orgX, orgY ); hwnd, menubarWidth, orgX, orgY );
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) if (!(wndPtr = WIN_FindWndPtr( hwnd )))
@ -3083,7 +3083,7 @@ UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth,
BOOL16 WINAPI ChangeMenu16( HMENU16 hMenu, UINT16 pos, SEGPTR data, BOOL16 WINAPI ChangeMenu16( HMENU16 hMenu, UINT16 pos, SEGPTR data,
UINT16 id, UINT16 flags ) UINT16 id, UINT16 flags )
{ {
TRACE(menu,"menu=%04x pos=%d data=%08lx id=%04x flags=%04x\n", TRACE("menu=%04x pos=%d data=%08lx id=%04x flags=%04x\n",
hMenu, pos, (DWORD)data, id, flags ); hMenu, pos, (DWORD)data, id, flags );
if (flags & MF_APPEND) return AppendMenu16( hMenu, flags & ~MF_APPEND, if (flags & MF_APPEND) return AppendMenu16( hMenu, flags & ~MF_APPEND,
id, data ); id, data );
@ -3109,7 +3109,7 @@ BOOL16 WINAPI ChangeMenu16( HMENU16 hMenu, UINT16 pos, SEGPTR data,
BOOL WINAPI ChangeMenuA( HMENU hMenu, UINT pos, LPCSTR data, BOOL WINAPI ChangeMenuA( HMENU hMenu, UINT pos, LPCSTR data,
UINT id, UINT flags ) UINT id, UINT flags )
{ {
TRACE(menu,"menu=%08x pos=%d data=%08lx id=%08x flags=%08x\n", TRACE("menu=%08x pos=%d data=%08lx id=%08x flags=%08x\n",
hMenu, pos, (DWORD)data, id, flags ); hMenu, pos, (DWORD)data, id, flags );
if (flags & MF_APPEND) return AppendMenuA( hMenu, flags & ~MF_APPEND, if (flags & MF_APPEND) return AppendMenuA( hMenu, flags & ~MF_APPEND,
id, data ); id, data );
@ -3130,7 +3130,7 @@ BOOL WINAPI ChangeMenuA( HMENU hMenu, UINT pos, LPCSTR data,
BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data,
UINT id, UINT flags ) UINT id, UINT flags )
{ {
TRACE(menu,"menu=%08x pos=%d data=%08lx id=%08x flags=%08x\n", TRACE("menu=%08x pos=%d data=%08lx id=%08x flags=%08x\n",
hMenu, pos, (DWORD)data, id, flags ); hMenu, pos, (DWORD)data, id, flags );
if (flags & MF_APPEND) return AppendMenuW( hMenu, flags & ~MF_APPEND, if (flags & MF_APPEND) return AppendMenuW( hMenu, flags & ~MF_APPEND,
id, data ); id, data );
@ -3162,7 +3162,7 @@ DWORD WINAPI CheckMenuItem( HMENU hMenu, UINT id, UINT flags )
MENUITEM *item; MENUITEM *item;
DWORD ret; DWORD ret;
TRACE(menu,"menu=%04x id=%04x flags=%04x\n", hMenu, id, flags ); TRACE("menu=%04x id=%04x flags=%04x\n", hMenu, id, flags );
if (!(item = MENU_FindItem( &hMenu, &id, flags ))) return -1; if (!(item = MENU_FindItem( &hMenu, &id, flags ))) return -1;
ret = item->fState & MF_CHECKED; ret = item->fState & MF_CHECKED;
if (flags & MF_CHECKED) item->fState |= MF_CHECKED; if (flags & MF_CHECKED) item->fState |= MF_CHECKED;
@ -3188,7 +3188,7 @@ UINT WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags )
UINT oldflags; UINT oldflags;
MENUITEM *item; MENUITEM *item;
TRACE(menu,"(%04x, %04X, %04X) !\n", TRACE("(%04x, %04X, %04X) !\n",
hMenu, wItemID, wFlags); hMenu, wItemID, wFlags);
if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags )))
@ -3218,14 +3218,14 @@ INT WINAPI GetMenuStringA( HMENU hMenu, UINT wItemID,
{ {
MENUITEM *item; MENUITEM *item;
TRACE(menu, "menu=%04x item=%04x ptr=%p len=%d flags=%04x\n", TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n",
hMenu, wItemID, str, nMaxSiz, wFlags ); hMenu, wItemID, str, nMaxSiz, wFlags );
if (!str || !nMaxSiz) return 0; if (!str || !nMaxSiz) return 0;
str[0] = '\0'; str[0] = '\0';
if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0; if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0;
if (!IS_STRING_ITEM(item->fType)) return 0; if (!IS_STRING_ITEM(item->fType)) return 0;
lstrcpynA( str, item->text, nMaxSiz ); lstrcpynA( str, item->text, nMaxSiz );
TRACE(menu, "returning '%s'\n", str ); TRACE("returning '%s'\n", str );
return strlen(str); return strlen(str);
} }
@ -3238,7 +3238,7 @@ INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID,
{ {
MENUITEM *item; MENUITEM *item;
TRACE(menu, "menu=%04x item=%04x ptr=%p len=%d flags=%04x\n", TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n",
hMenu, wItemID, str, nMaxSiz, wFlags ); hMenu, wItemID, str, nMaxSiz, wFlags );
if (!str || !nMaxSiz) return 0; if (!str || !nMaxSiz) return 0;
str[0] = '\0'; str[0] = '\0';
@ -3266,7 +3266,7 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID,
UINT wHilite ) UINT wHilite )
{ {
LPPOPUPMENU menu; LPPOPUPMENU menu;
TRACE(menu,"(%04x, %04x, %04x, %04x);\n", TRACE("(%04x, %04x, %04x, %04x);\n",
hWnd, hMenu, wItemID, wHilite); hWnd, hMenu, wItemID, wHilite);
if (!MENU_FindItem( &hMenu, &wItemID, wHilite )) return FALSE; if (!MENU_FindItem( &hMenu, &wItemID, wHilite )) return FALSE;
if (!(menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu))) return FALSE; if (!(menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu))) return FALSE;
@ -3292,7 +3292,7 @@ UINT16 WINAPI GetMenuState16( HMENU16 hMenu, UINT16 wItemID, UINT16 wFlags )
UINT WINAPI GetMenuState( HMENU hMenu, UINT wItemID, UINT wFlags ) UINT WINAPI GetMenuState( HMENU hMenu, UINT wItemID, UINT wFlags )
{ {
MENUITEM *item; MENUITEM *item;
TRACE(menu,"(menu=%04x, id=%04x, flags=%04x);\n", TRACE("(menu=%04x, id=%04x, flags=%04x);\n",
hMenu, wItemID, wFlags); hMenu, wItemID, wFlags);
if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return -1; if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return -1;
debug_print_menuitem (" item: ", item, ""); debug_print_menuitem (" item: ", item, "");
@ -3319,7 +3319,7 @@ INT16 WINAPI GetMenuItemCount16( HMENU16 hMenu )
{ {
LPPOPUPMENU menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu); LPPOPUPMENU menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu);
if (!IS_A_MENU(menu)) return -1; if (!IS_A_MENU(menu)) return -1;
TRACE(menu,"(%04x) returning %d\n", TRACE("(%04x) returning %d\n",
hMenu, menu->nItems ); hMenu, menu->nItems );
return menu->nItems; return menu->nItems;
} }
@ -3332,7 +3332,7 @@ INT WINAPI GetMenuItemCount( HMENU hMenu )
{ {
LPPOPUPMENU menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu); LPPOPUPMENU menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu);
if (!IS_A_MENU(menu)) return -1; if (!IS_A_MENU(menu)) return -1;
TRACE(menu,"(%04x) returning %d\n", TRACE("(%04x) returning %d\n",
hMenu, menu->nItems ); hMenu, menu->nItems );
return menu->nItems; return menu->nItems;
} }
@ -3382,10 +3382,10 @@ BOOL WINAPI InsertMenuA( HMENU hMenu, UINT pos, UINT flags,
MENUITEM *item; MENUITEM *item;
if (IS_STRING_ITEM(flags) && str) if (IS_STRING_ITEM(flags) && str)
TRACE(menu, "hMenu %04x, pos %d, flags %08x, " TRACE("hMenu %04x, pos %d, flags %08x, "
"id %04x, str '%s'\n", "id %04x, str '%s'\n",
hMenu, pos, flags, id, str ); hMenu, pos, flags, id, str );
else TRACE(menu, "hMenu %04x, pos %d, flags %08x, " else TRACE("hMenu %04x, pos %d, flags %08x, "
"id %04x, str %08lx (not a string)\n", "id %04x, str %08lx (not a string)\n",
hMenu, pos, flags, id, (DWORD)str ); hMenu, pos, flags, id, (DWORD)str );
@ -3470,7 +3470,7 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags )
LPPOPUPMENU menu; LPPOPUPMENU menu;
MENUITEM *item; MENUITEM *item;
TRACE(menu,"(menu=%04x pos=%04x flags=%04x)\n",hMenu, nPos, wFlags); TRACE("(menu=%04x pos=%04x flags=%04x)\n",hMenu, nPos, wFlags);
if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE;
if (!(menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu))) return FALSE; if (!(menu = (LPPOPUPMENU) USER_HEAP_LIN_ADDR(hMenu))) return FALSE;
@ -3544,13 +3544,13 @@ BOOL WINAPI ModifyMenuA( HMENU hMenu, UINT pos, UINT flags,
if (IS_STRING_ITEM(flags)) if (IS_STRING_ITEM(flags))
{ {
TRACE(menu, "%04x %d %04x %04x '%s'\n", TRACE("%04x %d %04x %04x '%s'\n",
hMenu, pos, flags, id, str ? str : "#NULL#" ); hMenu, pos, flags, id, str ? str : "#NULL#" );
if (!str) return FALSE; if (!str) return FALSE;
} }
else else
{ {
TRACE(menu, "%04x %d %04x %04x %08lx\n", TRACE("%04x %d %04x %04x %08lx\n",
hMenu, pos, flags, id, (DWORD)str ); hMenu, pos, flags, id, (DWORD)str );
} }
@ -3628,7 +3628,7 @@ BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags,
HBITMAP hNewUnCheck, HBITMAP hNewCheck) HBITMAP hNewUnCheck, HBITMAP hNewCheck)
{ {
MENUITEM *item; MENUITEM *item;
TRACE(menu,"(%04x, %04x, %04x, %04x, %04x)\n", TRACE("(%04x, %04x, %04x, %04x, %04x)\n",
hMenu, nPos, wFlags, hNewCheck, hNewUnCheck); hMenu, nPos, wFlags, hNewCheck, hNewUnCheck);
if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE;
@ -3669,7 +3669,7 @@ HMENU WINAPI CreateMenu(void)
menu->wMagic = MENU_MAGIC; menu->wMagic = MENU_MAGIC;
menu->FocusedItem = NO_SELECTED_ITEM; menu->FocusedItem = NO_SELECTED_ITEM;
TRACE(menu, "return %04x\n", hMenu ); TRACE("return %04x\n", hMenu );
return hMenu; return hMenu;
} }
@ -3688,7 +3688,7 @@ BOOL16 WINAPI DestroyMenu16( HMENU16 hMenu )
*/ */
BOOL WINAPI DestroyMenu( HMENU hMenu ) BOOL WINAPI DestroyMenu( HMENU hMenu )
{ {
TRACE(menu,"(%04x)\n", hMenu); TRACE("(%04x)\n", hMenu);
/* Silently ignore attempts to destroy default system popup */ /* Silently ignore attempts to destroy default system popup */
@ -3862,7 +3862,7 @@ BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu )
{ {
WND * wndPtr = WIN_FindWndPtr(hWnd); WND * wndPtr = WIN_FindWndPtr(hWnd);
TRACE(menu,"(%04x, %04x);\n", hWnd, hMenu); TRACE("(%04x, %04x);\n", hWnd, hMenu);
if (wndPtr && !(wndPtr->dwStyle & WS_CHILD)) if (wndPtr && !(wndPtr->dwStyle & WS_CHILD))
{ {
@ -3990,11 +3990,11 @@ HMENU16 WINAPI LoadMenu16( HINSTANCE16 instance, SEGPTR name )
if (HIWORD(name)) if (HIWORD(name))
{ {
char *str = (char *)PTR_SEG_TO_LIN( name ); char *str = (char *)PTR_SEG_TO_LIN( name );
TRACE(menu, "(%04x,'%s')\n", instance, str ); TRACE("(%04x,'%s')\n", instance, str );
if (str[0] == '#') name = (SEGPTR)atoi( str + 1 ); if (str[0] == '#') name = (SEGPTR)atoi( str + 1 );
} }
else else
TRACE(menu,"(%04x,%04x)\n",instance,LOWORD(name)); TRACE("(%04x,%04x)\n",instance,LOWORD(name));
if (!name) return 0; if (!name) return 0;
@ -4042,12 +4042,12 @@ HMENU16 WINAPI LoadMenuIndirect16( LPCVOID template )
WORD version, offset; WORD version, offset;
LPCSTR p = (LPCSTR)template; LPCSTR p = (LPCSTR)template;
TRACE(menu,"(%p)\n", template ); TRACE("(%p)\n", template );
version = GET_WORD(p); version = GET_WORD(p);
p += sizeof(WORD); p += sizeof(WORD);
if (version) if (version)
{ {
WARN(menu, "version must be 0 for Win16\n" ); WARN("version must be 0 for Win16\n" );
return 0; return 0;
} }
offset = GET_WORD(p); offset = GET_WORD(p);
@ -4071,7 +4071,7 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template )
WORD version, offset; WORD version, offset;
LPCSTR p = (LPCSTR)template; LPCSTR p = (LPCSTR)template;
TRACE(menu,"%p\n", template ); TRACE("%p\n", template );
version = GET_WORD(p); version = GET_WORD(p);
p += sizeof(WORD); p += sizeof(WORD);
switch (version) switch (version)
@ -4097,7 +4097,7 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template )
} }
return hMenu; return hMenu;
default: default:
ERR(menu, "version %d not supported.\n", version); ERR("version %d not supported.\n", version);
return 0; return 0;
} }
} }
@ -4342,7 +4342,7 @@ BOOL WINAPI SetMenuDefaultItem(HMENU hmenu, UINT uItem, UINT bypos)
POPUPMENU *menu; POPUPMENU *menu;
MENUITEM *item; MENUITEM *item;
TRACE(menu, "(0x%x,%d,%d)\n", hmenu, uItem, bypos); TRACE("(0x%x,%d,%d)\n", hmenu, uItem, bypos);
if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hmenu))) return FALSE; if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hmenu))) return FALSE;
@ -4390,7 +4390,7 @@ UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags)
MENUITEM * item; MENUITEM * item;
UINT i = 0; UINT i = 0;
TRACE(menu, "(0x%x,%d,%d)\n", hmenu, bypos, flags); TRACE("(0x%x,%d,%d)\n", hmenu, bypos, flags);
if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hmenu))) return -1; if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hmenu))) return -1;
@ -4481,7 +4481,7 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu,
MENUITEM *mifirst, *milast, *micheck; MENUITEM *mifirst, *milast, *micheck;
HMENU mfirst = hMenu, mlast = hMenu, mcheck = hMenu; HMENU mfirst = hMenu, mlast = hMenu, mcheck = hMenu;
TRACE(menu, "ox%x: %d-%d, check %d, bypos=%d\n", TRACE("ox%x: %d-%d, check %d, bypos=%d\n",
hMenu, first, last, check, bypos); hMenu, first, last, check, bypos);
mifirst = MENU_FindItem (&mfirst, &first, bypos); mifirst = MENU_FindItem (&mfirst, &first, bypos);
@ -4535,7 +4535,7 @@ BOOL WINAPI GetMenuItemRect (HWND hwnd, HMENU hMenu, UINT uItem,
MENUITEM *item; MENUITEM *item;
HWND referenceHwnd; HWND referenceHwnd;
TRACE(menu, "(0x%x,0x%x,%d,%p)\n", hwnd, hMenu, uItem, rect); TRACE("(0x%x,0x%x,%d,%p)\n", hwnd, hMenu, uItem, rect);
item = MENU_FindItem (&hMenu, &uItem, MF_BYPOSITION); item = MENU_FindItem (&hMenu, &uItem, MF_BYPOSITION);
referenceHwnd = hwnd; referenceHwnd = hwnd;
@ -4588,7 +4588,7 @@ BOOL WINAPI SetMenuInfo (HMENU hMenu, LPCMENUINFO lpmi)
{ {
POPUPMENU *menu; POPUPMENU *menu;
TRACE(menu,"(0x%04x %p)\n", hMenu, lpmi); TRACE("(0x%04x %p)\n", hMenu, lpmi);
if (lpmi && (lpmi->cbSize==sizeof(MENUINFO)) && (menu=(POPUPMENU*)USER_HEAP_LIN_ADDR(hMenu))) if (lpmi && (lpmi->cbSize==sizeof(MENUINFO)) && (menu=(POPUPMENU*)USER_HEAP_LIN_ADDR(hMenu)))
{ {
@ -4623,7 +4623,7 @@ BOOL WINAPI SetMenuInfo (HMENU hMenu, LPCMENUINFO lpmi)
BOOL WINAPI GetMenuInfo (HMENU hMenu, LPMENUINFO lpmi) BOOL WINAPI GetMenuInfo (HMENU hMenu, LPMENUINFO lpmi)
{ POPUPMENU *menu; { POPUPMENU *menu;
TRACE(menu,"(0x%04x %p)\n", hMenu, lpmi); TRACE("(0x%04x %p)\n", hMenu, lpmi);
if (lpmi && (menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu))) if (lpmi && (menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu)))
{ {
@ -4664,7 +4664,7 @@ BOOL WINAPI SetMenuContextHelpId( HMENU hMenu, DWORD dwContextHelpID)
{ {
LPPOPUPMENU menu; LPPOPUPMENU menu;
TRACE(menu,"(0x%04x 0x%08lx)\n", hMenu, dwContextHelpID); TRACE("(0x%04x 0x%08lx)\n", hMenu, dwContextHelpID);
if ((menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu))) if ((menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu)))
{ {
@ -4689,7 +4689,7 @@ DWORD WINAPI GetMenuContextHelpId( HMENU hMenu )
{ {
LPPOPUPMENU menu; LPPOPUPMENU menu;
TRACE(menu,"(0x%04x)\n", hMenu); TRACE("(0x%04x)\n", hMenu);
if ((menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu))) if ((menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu)))
{ {

22
controls/scroll.c
View file

@ -10,7 +10,7 @@
#include "scroll.h" #include "scroll.h"
#include "heap.h" #include "heap.h"
#include "win.h" #include "win.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(scroll) DEFAULT_DEBUG_CHANNEL(scroll)
@ -708,7 +708,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
return; /* Should never happen */ return; /* Should never happen */
} }
TRACE(scroll, "Event: hwnd=%04x bar=%d msg=%x pt=%ld,%ld hit=%d\n", TRACE("Event: hwnd=%04x bar=%d msg=%x pt=%ld,%ld hit=%d\n",
hwnd, nBar, msg, pt.x, pt.y, hittest ); hwnd, nBar, msg, pt.x, pt.y, hittest );
switch(SCROLL_trackHitTest) switch(SCROLL_trackHitTest)
@ -865,7 +865,7 @@ LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam,
CREATESTRUCTA *lpCreat = (CREATESTRUCTA *)lParam; CREATESTRUCTA *lpCreat = (CREATESTRUCTA *)lParam;
if (lpCreat->style & SBS_SIZEBOX) if (lpCreat->style & SBS_SIZEBOX)
{ {
FIXME(scroll, "Unimplemented style SBS_SIZEBOX.\n" ); FIXME("Unimplemented style SBS_SIZEBOX.\n" );
return 0; return 0;
} }
@ -893,7 +893,7 @@ LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam,
} }
} }
if (!hUpArrow) SCROLL_LoadBitmaps(); if (!hUpArrow) SCROLL_LoadBitmaps();
TRACE(scroll, "ScrollBar creation, hwnd=%04x\n", hwnd ); TRACE("ScrollBar creation, hwnd=%04x\n", hwnd );
return 0; return 0;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
@ -944,7 +944,7 @@ LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam,
return 0; /* FIXME: return previous position */ return 0; /* FIXME: return previous position */
case SBM_GETRANGE16: case SBM_GETRANGE16:
FIXME(scroll, "don't know how to handle SBM_GETRANGE16 (wp=%04x,lp=%08lx)\n", wParam, lParam ); FIXME("don't know how to handle SBM_GETRANGE16 (wp=%04x,lp=%08lx)\n", wParam, lParam );
return 0; return 0;
case SBM_GETRANGE: case SBM_GETRANGE:
@ -973,13 +973,13 @@ LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam,
case 0x00ed: case 0x00ed:
case 0x00ee: case 0x00ee:
case 0x00ef: case 0x00ef:
ERR(scroll, "unknown Win32 msg %04x wp=%08x lp=%08lx\n", ERR("unknown Win32 msg %04x wp=%08x lp=%08lx\n",
message, wParam, lParam ); message, wParam, lParam );
break; break;
default: default:
if (message >= WM_USER) if (message >= WM_USER)
WARN(scroll, "unknown msg %04x wp=%04x lp=%08lx\n", WARN("unknown msg %04x wp=%04x lp=%08lx\n",
message, wParam, lParam ); message, wParam, lParam );
return DefWindowProcA( hwnd, message, wParam, lParam ); return DefWindowProcA( hwnd, message, wParam, lParam );
} }
@ -1103,7 +1103,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
} }
} }
TRACE(scroll, "hwnd=%04x bar=%d %s\n", TRACE("hwnd=%04x bar=%d %s\n",
hwnd, nBar, dbg_str(scroll)); hwnd, nBar, dbg_str(scroll));
/* Make sure the page size is valid */ /* Make sure the page size is valid */
@ -1119,7 +1119,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
else if (infoPtr->CurVal > infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 )) else if (infoPtr->CurVal > infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 ))
infoPtr->CurVal = infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 ); infoPtr->CurVal = infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 );
TRACE(scroll, " new values: page=%d pos=%d min=%d max=%d\n", TRACE(" new values: page=%d pos=%d min=%d max=%d\n",
infoPtr->Page, infoPtr->CurVal, infoPtr->Page, infoPtr->CurVal,
infoPtr->MinVal, infoPtr->MaxVal ); infoPtr->MinVal, infoPtr->MaxVal );
@ -1397,7 +1397,7 @@ BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar,
BOOL retvalue = FALSE; BOOL retvalue = FALSE;
if (!wndPtr) return FALSE; if (!wndPtr) return FALSE;
TRACE(scroll, "hwnd=%04x bar=%d horz=%d, vert=%d\n", TRACE("hwnd=%04x bar=%d horz=%d, vert=%d\n",
hwnd, nBar, fShowH, fShowV ); hwnd, nBar, fShowH, fShowV );
switch(nBar) switch(nBar)
@ -1498,7 +1498,7 @@ BOOL WINAPI EnableScrollBar( HWND hwnd, INT nBar, UINT flags )
BOOL bFineWithMe; BOOL bFineWithMe;
SCROLLBAR_INFO *infoPtr; SCROLLBAR_INFO *infoPtr;
TRACE(scroll, "%04x %d %d\n", hwnd, nBar, flags ); TRACE("%04x %d %d\n", hwnd, nBar, flags );
flags &= ESB_DISABLE_BOTH; flags &= ESB_DISABLE_BOTH;

14
controls/static.c
View file

@ -11,7 +11,7 @@
#include "cursoricon.h" #include "cursoricon.h"
#include "static.h" #include "static.h"
#include "heap.h" #include "heap.h"
#include "debug.h" #include "debugtools.h"
#include "tweak.h" #include "tweak.h"
DEFAULT_DEBUG_CHANNEL(static) DEFAULT_DEBUG_CHANNEL(static)
@ -64,7 +64,7 @@ static HICON16 STATIC_SetIcon( WND *wndPtr, HICON16 hicon )
if ((wndPtr->dwStyle & SS_TYPEMASK) != SS_ICON) return 0; if ((wndPtr->dwStyle & SS_TYPEMASK) != SS_ICON) return 0;
if (hicon && !info) { if (hicon && !info) {
ERR(static, "huh? hicon!=0, but info=0???\n"); ERR("huh? hicon!=0, but info=0???\n");
return 0; return 0;
} }
prevIcon = infoPtr->hIcon; prevIcon = infoPtr->hIcon;
@ -91,7 +91,7 @@ static HICON16 STATIC_SetBitmap( WND *wndPtr, HICON16 hicon )
if ((wndPtr->dwStyle & SS_TYPEMASK) != SS_BITMAP) return 0; if ((wndPtr->dwStyle & SS_TYPEMASK) != SS_BITMAP) return 0;
if (hicon && !info) { if (hicon && !info) {
ERR(static, "huh? hicon!=0, but info=0???\n"); ERR("huh? hicon!=0, but info=0???\n");
return 0; return 0;
} }
prevIcon = infoPtr->hIcon; prevIcon = infoPtr->hIcon;
@ -127,7 +127,7 @@ static HICON16 STATIC_LoadIcon( WND *wndPtr, LPCSTR name )
LPSTR segname = SEGPTR_STRDUP(name); LPSTR segname = SEGPTR_STRDUP(name);
if (HIWORD(wndPtr->hInstance)) if (HIWORD(wndPtr->hInstance))
FIXME(static,"win16 window class, but win32 hinstance??\n"); FIXME("win16 window class, but win32 hinstance??\n");
hicon = LoadIcon16( wndPtr->hInstance, SEGPTR_GET(segname) ); hicon = LoadIcon16( wndPtr->hInstance, SEGPTR_GET(segname) );
SEGPTR_FREE(segname); SEGPTR_FREE(segname);
} }
@ -198,14 +198,14 @@ LRESULT WINAPI StaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam,
if (cs->lpszName) if (cs->lpszName)
STATIC_SetBitmap( wndPtr, STATIC_SetBitmap( wndPtr,
STATIC_LoadBitmap( wndPtr, cs->lpszName )); STATIC_LoadBitmap( wndPtr, cs->lpszName ));
WARN(static, "style SS_BITMAP, dwStyle is 0x%08lx\n", WARN("style SS_BITMAP, dwStyle is 0x%08lx\n",
wndPtr->dwStyle); wndPtr->dwStyle);
lResult = 1; lResult = 1;
goto END; goto END;
} }
if (!HIWORD(cs->lpszName) && (cs->lpszName)) if (!HIWORD(cs->lpszName) && (cs->lpszName))
{ {
FIXME(static,"windowName is 0x%04x, not doing DefWindowProc\n", FIXME("windowName is 0x%04x, not doing DefWindowProc\n",
LOWORD(cs->lpszName)); LOWORD(cs->lpszName));
lResult = 1; lResult = 1;
goto END; goto END;
@ -216,7 +216,7 @@ LRESULT WINAPI StaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam,
case WM_CREATE: case WM_CREATE:
if (style < 0L || style > SS_TYPEMASK) if (style < 0L || style > SS_TYPEMASK)
{ {
ERR(static, "Unknown style 0x%02lx\n", style ); ERR("Unknown style 0x%02lx\n", style );
lResult = -1L; lResult = -1L;
break; break;
} }

14
controls/uitools.c
View file

@ -6,7 +6,7 @@
*/ */
#include "winuser.h" #include "winuser.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(graphics) DEFAULT_DEBUG_CHANNEL(graphics)
@ -563,7 +563,7 @@ BOOL16 WINAPI DrawEdge16( HDC16 hdc, LPRECT16 rc, UINT16 edge, UINT16 flags )
*/ */
BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags ) BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags )
{ {
TRACE(graphics, "%04x %d,%d-%d,%d %04x %04x\n", TRACE("%04x %d,%d-%d,%d %04x %04x\n",
hdc, rc->left, rc->top, rc->right, rc->bottom, edge, flags ); hdc, rc->left, rc->top, rc->right, rc->bottom, edge, flags );
if(flags & BF_DIAGONAL) if(flags & BF_DIAGONAL)
@ -929,7 +929,7 @@ static BOOL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState)
return UITOOLS95_DFC_ButtonRadio(hdc, rc, uState); return UITOOLS95_DFC_ButtonRadio(hdc, rc, uState);
default: default:
WARN(graphics, "Invalid button state=0x%04x\n", uState); WARN("Invalid button state=0x%04x\n", uState);
} }
return FALSE; return FALSE;
@ -1065,7 +1065,7 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
break; break;
default: default:
WARN(graphics, "Invalid caption; flags=0x%04x\n", uFlags); WARN("Invalid caption; flags=0x%04x\n", uFlags);
return FALSE; return FALSE;
} }
@ -1235,7 +1235,7 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags)
return TRUE; return TRUE;
default: default:
WARN(graphics, "Invalid scroll; flags=0x%04x\n", uFlags); WARN("Invalid scroll; flags=0x%04x\n", uFlags);
return FALSE; return FALSE;
} }
@ -1337,7 +1337,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
break; break;
default: default:
WARN(graphics, "Invalid menu; flags=0x%04x\n", uFlags); WARN("Invalid menu; flags=0x%04x\n", uFlags);
retval = FALSE; retval = FALSE;
break; break;
} }
@ -1385,7 +1385,7 @@ BOOL WINAPI DrawFrameControl( HDC hdc, LPRECT rc, UINT uType,
case DFC_SCROLL: case DFC_SCROLL:
return UITOOLS95_DrawFrameScroll(hdc, rc, uState); return UITOOLS95_DrawFrameScroll(hdc, rc, uState);
default: default:
WARN(graphics, "(%x,%p,%d,%x), bad type!\n", WARN("(%x,%p,%d,%x), bad type!\n",
hdc,rc,uType,uState ); hdc,rc,uType,uState );
} }
return FALSE; return FALSE;

2
dlls/advapi32/advapi.c
View file

@ -12,7 +12,7 @@
#include "wine/winestring.h" #include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "debug.h" #include "debugtools.h"
/****************************************************************************** /******************************************************************************

4
dlls/advapi32/crypt.c
View file

@ -4,7 +4,7 @@
#include "windef.h" #include "windef.h"
#include "winerror.h" #include "winerror.h"
#include "wincrypt.h" #include "wincrypt.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(advapi) DEFAULT_DEBUG_CHANNEL(advapi)
@ -26,7 +26,7 @@ BOOL WINAPI
CryptAcquireContextA( HCRYPTPROV *phProv, LPCSTR pszContainer, CryptAcquireContextA( HCRYPTPROV *phProv, LPCSTR pszContainer,
LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags) LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags)
{ {
FIXME(advapi,"(%p, %s, %s, %ld, %08lx): stub!\n", phProv, pszContainer, FIXME_(advapi)("(%p, %s, %s, %ld, %08lx): stub!\n", phProv, pszContainer,
pszProvider, dwProvType, dwFlags); pszProvider, dwProvType, dwFlags);
return FALSE; return FALSE;
} }

38
dlls/advapi32/eventlog.c
View file

@ -9,7 +9,7 @@
#include "winerror.h" #include "winerror.h"
#include "heap.h" #include "heap.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(advapi) DEFAULT_DEBUG_CHANNEL(advapi)
@ -18,7 +18,7 @@ DEFAULT_DEBUG_CHANNEL(advapi)
*/ */
BOOL WINAPI BackupEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName ) BOOL WINAPI BackupEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -32,7 +32,7 @@ BOOL WINAPI BackupEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName )
BOOL WINAPI BOOL WINAPI
BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -41,7 +41,7 @@ BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName )
*/ */
BOOL WINAPI ClearEventLogA ( HANDLE hEventLog, LPCSTR lpBackupFileName ) BOOL WINAPI ClearEventLogA ( HANDLE hEventLog, LPCSTR lpBackupFileName )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -50,7 +50,7 @@ BOOL WINAPI ClearEventLogA ( HANDLE hEventLog, LPCSTR lpBackupFileName )
*/ */
BOOL WINAPI ClearEventLogW ( HANDLE hEventLog, LPCWSTR lpBackupFileName ) BOOL WINAPI ClearEventLogW ( HANDLE hEventLog, LPCWSTR lpBackupFileName )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -59,7 +59,7 @@ BOOL WINAPI ClearEventLogW ( HANDLE hEventLog, LPCWSTR lpBackupFileName )
*/ */
BOOL WINAPI CloseEventLog ( HANDLE hEventLog ) BOOL WINAPI CloseEventLog ( HANDLE hEventLog )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -74,7 +74,7 @@ BOOL WINAPI CloseEventLog ( HANDLE hEventLog )
*/ */
BOOL WINAPI DeregisterEventSource( HANDLE hEventLog ) BOOL WINAPI DeregisterEventSource( HANDLE hEventLog )
{ {
FIXME(advapi, "(%d): stub\n",hEventLog); FIXME("(%d): stub\n",hEventLog);
return TRUE; return TRUE;
} }
@ -88,7 +88,7 @@ BOOL WINAPI DeregisterEventSource( HANDLE hEventLog )
BOOL WINAPI BOOL WINAPI
GetNumberOfEventLogRecords( HANDLE hEventLog, PDWORD NumberOfRecords ) GetNumberOfEventLogRecords( HANDLE hEventLog, PDWORD NumberOfRecords )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -102,7 +102,7 @@ GetNumberOfEventLogRecords( HANDLE hEventLog, PDWORD NumberOfRecords )
BOOL WINAPI BOOL WINAPI
GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord ) GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord )
{ {
FIXME(advapi,":stub\n"); FIXME(":stub\n");
return TRUE; return TRUE;
} }
@ -115,7 +115,7 @@ GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord )
*/ */
BOOL WINAPI NotifyChangeEventLog( HANDLE hEventLog, HANDLE hEvent ) BOOL WINAPI NotifyChangeEventLog( HANDLE hEventLog, HANDLE hEvent )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -125,7 +125,7 @@ BOOL WINAPI NotifyChangeEventLog( HANDLE hEventLog, HANDLE hEvent )
HANDLE WINAPI HANDLE WINAPI
OpenBackupEventLogA( LPCSTR lpUNCServerName, LPCSTR lpFileName ) OpenBackupEventLogA( LPCSTR lpUNCServerName, LPCSTR lpFileName )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -139,7 +139,7 @@ OpenBackupEventLogA( LPCSTR lpUNCServerName, LPCSTR lpFileName )
HANDLE WINAPI HANDLE WINAPI
OpenBackupEventLogW( LPCWSTR lpUNCServerName, LPCWSTR lpFileName ) OpenBackupEventLogW( LPCWSTR lpUNCServerName, LPCWSTR lpFileName )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -148,7 +148,7 @@ OpenBackupEventLogW( LPCWSTR lpUNCServerName, LPCWSTR lpFileName )
*/ */
HANDLE WINAPI OpenEventLogA(LPCSTR uncname,LPCSTR source) HANDLE WINAPI OpenEventLogA(LPCSTR uncname,LPCSTR source)
{ {
FIXME(advapi,"(%s,%s),stub!\n",uncname,source); FIXME("(%s,%s),stub!\n",uncname,source);
return 0xcafe4242; return 0xcafe4242;
} }
@ -162,7 +162,7 @@ HANDLE WINAPI OpenEventLogA(LPCSTR uncname,LPCSTR source)
HANDLE WINAPI HANDLE WINAPI
OpenEventLogW( LPCWSTR uncname, LPCWSTR source ) OpenEventLogW( LPCWSTR uncname, LPCWSTR source )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -172,7 +172,7 @@ OpenEventLogW( LPCWSTR uncname, LPCWSTR source )
BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset, BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
LPVOID lpBuffer, DWORD nNumberOfBytesToRead, DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded ) LPVOID lpBuffer, DWORD nNumberOfBytesToRead, DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -193,7 +193,7 @@ ReadEventLogW( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded ) DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -225,7 +225,7 @@ HANDLE WINAPI RegisterEventSourceA( LPCSTR lpUNCServerName, LPCSTR lpSourceName
HANDLE WINAPI HANDLE WINAPI
RegisterEventSourceW( LPCWSTR lpUNCServerName, LPCWSTR lpSourceName ) RegisterEventSourceW( LPCWSTR lpUNCServerName, LPCWSTR lpSourceName )
{ {
FIXME(advapi, "(%s,%s): stub\n", debugstr_w(lpUNCServerName), FIXME("(%s,%s): stub\n", debugstr_w(lpUNCServerName),
debugstr_w(lpSourceName)); debugstr_w(lpSourceName));
return 1; return 1;
} }
@ -236,7 +236,7 @@ RegisterEventSourceW( LPCWSTR lpUNCServerName, LPCWSTR lpSourceName )
BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID, BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID,
PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCSTR *lpStrings, LPVOID lpRawData) PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCSTR *lpStrings, LPVOID lpRawData)
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }
@ -259,6 +259,6 @@ ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory,
DWORD dwEventID, PSID lpUserSid, WORD wNumStrings, DWORD dwEventID, PSID lpUserSid, WORD wNumStrings,
DWORD dwDataSize, LPCWSTR *lpStrings, LPVOID lpRawData ) DWORD dwDataSize, LPCWSTR *lpStrings, LPVOID lpRawData )
{ {
FIXME(advapi,"stub\n"); FIXME("stub\n");
return TRUE; return TRUE;
} }

46
dlls/advapi32/service.c
View file

@ -9,7 +9,7 @@
#include "winreg.h" #include "winreg.h"
#include "winerror.h" #include "winerror.h"
#include "heap.h" #include "heap.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(advapi) DEFAULT_DEBUG_CHANNEL(advapi)
@ -26,7 +26,7 @@ EnumServicesStatusA( HANDLE hSCManager, DWORD dwServiceType,
DWORD dwServiceState, LPVOID lpServices, DWORD dwServiceState, LPVOID lpServices,
DWORD cbBufSize, LPDWORD pcbBytesNeeded, DWORD cbBufSize, LPDWORD pcbBytesNeeded,
LPDWORD lpServicesReturned, LPDWORD lpResumeHandle ) LPDWORD lpServicesReturned, LPDWORD lpResumeHandle )
{ FIXME (advapi,"%x type=%lx state=%lx %p %lx %p %p %p\n", hSCManager, { FIXME("%x type=%lx state=%lx %p %lx %p %p %p\n", hSCManager,
dwServiceType, dwServiceState, lpServices, cbBufSize, dwServiceType, dwServiceState, lpServices, cbBufSize,
pcbBytesNeeded, lpServicesReturned, lpResumeHandle); pcbBytesNeeded, lpServicesReturned, lpResumeHandle);
SetLastError (ERROR_ACCESS_DENIED); SetLastError (ERROR_ACCESS_DENIED);
@ -41,7 +41,7 @@ StartServiceCtrlDispatcherA( LPSERVICE_TABLE_ENTRYA servent )
{ LPSERVICE_TABLE_ENTRYA ptr = servent; { LPSERVICE_TABLE_ENTRYA ptr = servent;
while (ptr->lpServiceName) while (ptr->lpServiceName)
{ FIXME(advapi,"%s at %p\n", ptr->lpServiceName, ptr); { FIXME("%s at %p\n", ptr->lpServiceName, ptr);
ptr++; ptr++;
} }
return TRUE; return TRUE;
@ -59,7 +59,7 @@ StartServiceCtrlDispatcherW( LPSERVICE_TABLE_ENTRYW servent )
LPSERVICE_MAIN_FUNCTIONW fpMain; LPSERVICE_MAIN_FUNCTIONW fpMain;
while (ptr->lpServiceName) while (ptr->lpServiceName)
{ FIXME(advapi,"%s at %p): STUB.\n", debugstr_w(ptr->lpServiceName),ptr); { FIXME("%s at %p): STUB.\n", debugstr_w(ptr->lpServiceName),ptr);
fpMain = ptr->lpServiceProc; fpMain = ptr->lpServiceProc;
fpMain(0,NULL); /* try to start the service */ fpMain(0,NULL); /* try to start the service */
ptr++; ptr++;
@ -73,7 +73,7 @@ StartServiceCtrlDispatcherW( LPSERVICE_TABLE_ENTRYW servent )
SERVICE_STATUS_HANDLE WINAPI SERVICE_STATUS_HANDLE WINAPI
RegisterServiceCtrlHandlerA( LPSTR lpServiceName, RegisterServiceCtrlHandlerA( LPSTR lpServiceName,
LPHANDLER_FUNCTION lpfHandler ) LPHANDLER_FUNCTION lpfHandler )
{ FIXME(advapi,"%s %p\n", lpServiceName, lpfHandler); { FIXME("%s %p\n", lpServiceName, lpfHandler);
return 0xcacacafe; return 0xcacacafe;
} }
@ -87,7 +87,7 @@ RegisterServiceCtrlHandlerA( LPSTR lpServiceName,
SERVICE_STATUS_HANDLE WINAPI SERVICE_STATUS_HANDLE WINAPI
RegisterServiceCtrlHandlerW( LPWSTR lpServiceName, RegisterServiceCtrlHandlerW( LPWSTR lpServiceName,
LPHANDLER_FUNCTION lpfHandler ) LPHANDLER_FUNCTION lpfHandler )
{ FIXME(advapi,"%s %p\n", debugstr_w(lpServiceName), lpfHandler); { FIXME("%s %p\n", debugstr_w(lpServiceName), lpfHandler);
return 0xcacacafe; return 0xcacacafe;
} }
@ -100,14 +100,14 @@ RegisterServiceCtrlHandlerW( LPWSTR lpServiceName,
*/ */
BOOL WINAPI BOOL WINAPI
SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus )
{ FIXME(advapi,"%lx %p\n",hService, lpStatus); { FIXME("%lx %p\n",hService, lpStatus);
TRACE(advapi,"\tType:%lx\n",lpStatus->dwServiceType); TRACE("\tType:%lx\n",lpStatus->dwServiceType);
TRACE(advapi,"\tState:%lx\n",lpStatus->dwCurrentState); TRACE("\tState:%lx\n",lpStatus->dwCurrentState);
TRACE(advapi,"\tControlAccepted:%lx\n",lpStatus->dwControlsAccepted); TRACE("\tControlAccepted:%lx\n",lpStatus->dwControlsAccepted);
TRACE(advapi,"\tExitCode:%lx\n",lpStatus->dwWin32ExitCode); TRACE("\tExitCode:%lx\n",lpStatus->dwWin32ExitCode);
TRACE(advapi,"\tServiceExitCode:%lx\n",lpStatus->dwServiceSpecificExitCode); TRACE("\tServiceExitCode:%lx\n",lpStatus->dwServiceSpecificExitCode);
TRACE(advapi,"\tCheckPoint:%lx\n",lpStatus->dwCheckPoint); TRACE("\tCheckPoint:%lx\n",lpStatus->dwCheckPoint);
TRACE(advapi,"\tWaitHint:%lx\n",lpStatus->dwWaitHint); TRACE("\tWaitHint:%lx\n",lpStatus->dwWaitHint);
return TRUE; return TRUE;
} }
@ -147,7 +147,7 @@ HANDLE WINAPI
OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName,
DWORD dwDesiredAccess ) DWORD dwDesiredAccess )
{ {
FIXME(advapi,"(%s,%s,0x%08lx): stub\n", debugstr_w(lpMachineName), FIXME("(%s,%s,0x%08lx): stub\n", debugstr_w(lpMachineName),
debugstr_w(lpDatabaseName), dwDesiredAccess); debugstr_w(lpDatabaseName), dwDesiredAccess);
return 1; return 1;
} }
@ -186,7 +186,7 @@ BOOL WINAPI
ControlService( HANDLE hService, DWORD dwControl, ControlService( HANDLE hService, DWORD dwControl,
LPSERVICE_STATUS lpServiceStatus ) LPSERVICE_STATUS lpServiceStatus )
{ {
FIXME(advapi, "(%d,%ld,%p): stub\n",hService,dwControl,lpServiceStatus); FIXME("(%d,%ld,%p): stub\n",hService,dwControl,lpServiceStatus);
return TRUE; return TRUE;
} }
@ -206,7 +206,7 @@ ControlService( HANDLE hService, DWORD dwControl,
BOOL WINAPI BOOL WINAPI
CloseServiceHandle( HANDLE hSCObject ) CloseServiceHandle( HANDLE hSCObject )
{ {
FIXME(advapi, "(%d): stub\n", hSCObject); FIXME("(%d): stub\n", hSCObject);
return TRUE; return TRUE;
} }
@ -246,7 +246,7 @@ HANDLE WINAPI
OpenServiceW(HANDLE hSCManager, LPCWSTR lpServiceName, OpenServiceW(HANDLE hSCManager, LPCWSTR lpServiceName,
DWORD dwDesiredAccess) DWORD dwDesiredAccess)
{ {
FIXME(advapi, "(%d,%p,%ld): stub\n",hSCManager, lpServiceName, FIXME("(%d,%p,%ld): stub\n",hSCManager, lpServiceName,
dwDesiredAccess); dwDesiredAccess);
return 1; return 1;
} }
@ -264,7 +264,7 @@ CreateServiceA( DWORD hSCManager, LPCSTR lpServiceName,
LPCSTR lpDependencies, LPCSTR lpServiceStartName, LPCSTR lpDependencies, LPCSTR lpServiceStartName,
LPCSTR lpPassword ) LPCSTR lpPassword )
{ {
FIXME(advapi, "(%ld,%s,%s,...): stub\n", FIXME("(%ld,%s,%s,...): stub\n",
hSCManager, debugstr_a(lpServiceName), debugstr_a(lpDisplayName)); hSCManager, debugstr_a(lpServiceName), debugstr_a(lpDisplayName));
return 1; return 1;
} }
@ -284,7 +284,7 @@ CreateServiceA( DWORD hSCManager, LPCSTR lpServiceName,
BOOL WINAPI BOOL WINAPI
DeleteService( HANDLE hService ) DeleteService( HANDLE hService )
{ {
FIXME(advapi, "(%d): stub\n",hService); FIXME("(%d): stub\n",hService);
return TRUE; return TRUE;
} }
@ -299,7 +299,7 @@ BOOL WINAPI
StartServiceA( HANDLE hService, DWORD dwNumServiceArgs, StartServiceA( HANDLE hService, DWORD dwNumServiceArgs,
LPCSTR *lpServiceArgVectors ) LPCSTR *lpServiceArgVectors )
{ {
FIXME(advapi, "(%d,%ld,%p): stub\n",hService,dwNumServiceArgs,lpServiceArgVectors); FIXME("(%d,%ld,%p): stub\n",hService,dwNumServiceArgs,lpServiceArgVectors);
return TRUE; return TRUE;
} }
@ -322,7 +322,7 @@ BOOL WINAPI
StartServiceW( HANDLE hService, DWORD dwNumServiceArgs, StartServiceW( HANDLE hService, DWORD dwNumServiceArgs,
LPCWSTR *lpServiceArgVectors ) LPCWSTR *lpServiceArgVectors )
{ {
FIXME(advapi, "(%d,%ld,%p): stub\n",hService,dwNumServiceArgs, FIXME("(%d,%ld,%p): stub\n",hService,dwNumServiceArgs,
lpServiceArgVectors); lpServiceArgVectors);
return TRUE; return TRUE;
} }
@ -341,7 +341,7 @@ StartServiceW( HANDLE hService, DWORD dwNumServiceArgs,
BOOL WINAPI BOOL WINAPI
QueryServiceStatus( HANDLE hService, LPVOID lpservicestatus ) QueryServiceStatus( HANDLE hService, LPVOID lpservicestatus )
{ {
FIXME(advapi,"(%d,%p),stub!\n",hService,lpservicestatus); FIXME("(%d,%p),stub!\n",hService,lpservicestatus);
return TRUE; return TRUE;
} }

24
dlls/imagehlp/access.c
View file

@ -9,7 +9,7 @@
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "heap.h" #include "heap.h"
#include "debug.h" #include "debugtools.h"
#include "imagehlp.h" #include "imagehlp.h"
DEFAULT_DEBUG_CHANNEL(imagehlp) DEFAULT_DEBUG_CHANNEL(imagehlp)
@ -44,7 +44,7 @@ BOOL WINAPI EnumerateLoadedModules(
PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback, PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback,
PVOID UserContext) PVOID UserContext)
{ {
FIXME(imagehlp, "(0x%08x, %p, %p): stub\n", FIXME("(0x%08x, %p, %p): stub\n",
hProcess, EnumLoadedModulesCallback, UserContext hProcess, EnumLoadedModulesCallback, UserContext
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -56,7 +56,7 @@ BOOL WINAPI EnumerateLoadedModules(
*/ */
DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE Module) DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE Module)
{ {
FIXME(imagehlp, "(0x%08x): stub\n", Module); FIXME("(0x%08x): stub\n", Module);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; return 0;
} }
@ -68,7 +68,7 @@ BOOL WINAPI GetImageConfigInformation(
PLOADED_IMAGE LoadedImage, PLOADED_IMAGE LoadedImage,
PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation) PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation)
{ {
FIXME(imagehlp, "(%p, %p): stub\n", FIXME("(%p, %p): stub\n",
LoadedImage, ImageConfigInformation LoadedImage, ImageConfigInformation
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -82,7 +82,7 @@ DWORD WINAPI GetImageUnusedHeaderBytes(
PLOADED_IMAGE LoadedImage, PLOADED_IMAGE LoadedImage,
LPDWORD SizeUnusedHeaderBytes) LPDWORD SizeUnusedHeaderBytes)
{ {
FIXME(imagehlp, "(%p, %p): stub\n", FIXME("(%p, %p): stub\n",
LoadedImage, SizeUnusedHeaderBytes LoadedImage, SizeUnusedHeaderBytes
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -95,7 +95,7 @@ DWORD WINAPI GetImageUnusedHeaderBytes(
PVOID WINAPI ImageDirectoryEntryToData( PVOID WINAPI ImageDirectoryEntryToData(
PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size) PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size)
{ {
FIXME(imagehlp, "(%p, %d, %d, %p): stub\n", FIXME("(%p, %d, %d, %p): stub\n",
Base, MappedAsImage, DirectoryEntry, Size Base, MappedAsImage, DirectoryEntry, Size
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -127,7 +127,7 @@ PIMAGE_NT_HEADERS WINAPI ImageNtHeader(PVOID Base)
PIMAGE_SECTION_HEADER WINAPI ImageRvaToSection( PIMAGE_SECTION_HEADER WINAPI ImageRvaToSection(
PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva) PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva)
{ {
FIXME(imagehlp, "(%p, %p, %ld): stub\n", NtHeaders, Base, Rva); FIXME("(%p, %p, %ld): stub\n", NtHeaders, Base, Rva);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return NULL; return NULL;
} }
@ -139,7 +139,7 @@ PVOID WINAPI ImageRvaToVa(
PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva, PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva,
PIMAGE_SECTION_HEADER *LastRvaSection) PIMAGE_SECTION_HEADER *LastRvaSection)
{ {
FIXME(imagehlp, "(%p, %p, %ld, %p): stub\n", FIXME("(%p, %p, %ld, %p): stub\n",
NtHeaders, Base, Rva, LastRvaSection NtHeaders, Base, Rva, LastRvaSection
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -215,7 +215,7 @@ BOOL WINAPI MapAndLoad(
hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL))) hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL)))
{ {
DWORD dwLastError = GetLastError(); DWORD dwLastError = GetLastError();
WARN(imagehlp, "CreateFileMapping: Error = %ld\n", dwLastError); WARN("CreateFileMapping: Error = %ld\n", dwLastError);
SetLastError(dwLastError); SetLastError(dwLastError);
goto Error; goto Error;
} }
@ -226,7 +226,7 @@ BOOL WINAPI MapAndLoad(
hFileMapping, FILE_MAP_READ, 0, 0, 0))) hFileMapping, FILE_MAP_READ, 0, 0, 0)))
{ {
DWORD dwLastError = GetLastError(); DWORD dwLastError = GetLastError();
WARN(imagehlp, "MapViewOfFile: Error = %ld\n", dwLastError); WARN("MapViewOfFile: Error = %ld\n", dwLastError);
SetLastError(dwLastError); SetLastError(dwLastError);
goto Error; goto Error;
} }
@ -287,7 +287,7 @@ BOOL WINAPI SetImageConfigInformation(
PLOADED_IMAGE LoadedImage, PLOADED_IMAGE LoadedImage,
PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation) PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigInformation)
{ {
FIXME(imagehlp, "(%p, %p): stub\n", FIXME("(%p, %p): stub\n",
LoadedImage, ImageConfigInformation LoadedImage, ImageConfigInformation
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -299,7 +299,7 @@ BOOL WINAPI SetImageConfigInformation(
*/ */
BOOL WINAPI UnMapAndLoad(PLOADED_IMAGE LoadedImage) BOOL WINAPI UnMapAndLoad(PLOADED_IMAGE LoadedImage)
{ {
FIXME(imagehlp, "(%p): stub\n", LoadedImage); FIXME("(%p): stub\n", LoadedImage);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }

14
dlls/imagehlp/debug.c
View file

@ -7,7 +7,7 @@
#include "winerror.h" #include "winerror.h"
#include "winbase.h" #include "winbase.h"
#include "windef.h" #include "windef.h"
#include "debug.h" #include "debugtools.h"
#include "imagehlp.h" #include "imagehlp.h"
DEFAULT_DEBUG_CHANNEL(imagehlp) DEFAULT_DEBUG_CHANNEL(imagehlp)
@ -18,7 +18,7 @@ DEFAULT_DEBUG_CHANNEL(imagehlp)
HANDLE WINAPI FindDebugInfoFile( HANDLE WINAPI FindDebugInfoFile(
LPSTR FileName, LPSTR SymbolPath, LPSTR DebugFilePath) LPSTR FileName, LPSTR SymbolPath, LPSTR DebugFilePath)
{ {
FIXME(imagehlp, "(%s, %s, %s): stub\n", FIXME("(%s, %s, %s): stub\n",
debugstr_a(FileName), debugstr_a(SymbolPath), debugstr_a(FileName), debugstr_a(SymbolPath),
debugstr_a(DebugFilePath) debugstr_a(DebugFilePath)
); );
@ -32,7 +32,7 @@ HANDLE WINAPI FindDebugInfoFile(
HANDLE WINAPI FindExecutableImage( HANDLE WINAPI FindExecutableImage(
LPSTR FileName, LPSTR SymbolPath, LPSTR ImageFilePath) LPSTR FileName, LPSTR SymbolPath, LPSTR ImageFilePath)
{ {
FIXME(imagehlp, "(%s, %s, %s): stub\n", FIXME("(%s, %s, %s): stub\n",
debugstr_a(FileName), debugstr_a(SymbolPath), debugstr_a(FileName), debugstr_a(SymbolPath),
debugstr_a(ImageFilePath) debugstr_a(ImageFilePath)
); );
@ -47,7 +47,7 @@ PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(
HANDLE FileHandle, LPSTR FileName, HANDLE FileHandle, LPSTR FileName,
LPSTR SymbolPath, DWORD ImageBase) LPSTR SymbolPath, DWORD ImageBase)
{ {
FIXME(imagehlp, "(0x%08x, %s, %s, 0x%08lx): stub\n", FIXME("(0x%08x, %s, %s, 0x%08lx): stub\n",
FileHandle, FileName, SymbolPath, ImageBase FileHandle, FileName, SymbolPath, ImageBase
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -65,7 +65,7 @@ BOOL WINAPI StackWalk(
PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine, PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,
PTRANSLATE_ADDRESS_ROUTINE TranslateAddress) PTRANSLATE_ADDRESS_ROUTINE TranslateAddress)
{ {
FIXME(imagehlp, FIXME(
"(%ld, 0x%08x, 0x%08x, %p, %p, %p, %p, %p, %p): stub\n", "(%ld, 0x%08x, 0x%08x, %p, %p, %p, %p, %p, %p): stub\n",
MachineType, hProcess, hThread, StackFrame, ContextRecord, MachineType, hProcess, hThread, StackFrame, ContextRecord,
ReadMemoryRoutine, FunctionTableAccessRoutine, ReadMemoryRoutine, FunctionTableAccessRoutine,
@ -82,7 +82,7 @@ DWORD WINAPI UnDecorateSymbolName(
LPCSTR DecoratedName, LPSTR UnDecoratedName, LPCSTR DecoratedName, LPSTR UnDecoratedName,
DWORD UndecoratedLength, DWORD Flags) DWORD UndecoratedLength, DWORD Flags)
{ {
FIXME(imagehlp, "(%s, %s, %ld, 0x%08lx): stub\n", FIXME("(%s, %s, %ld, 0x%08lx): stub\n",
debugstr_a(DecoratedName), debugstr_a(UnDecoratedName), debugstr_a(DecoratedName), debugstr_a(UnDecoratedName),
UndecoratedLength, Flags UndecoratedLength, Flags
); );
@ -97,7 +97,7 @@ DWORD WINAPI UnDecorateSymbolName(
BOOL WINAPI UnmapDebugInformation( BOOL WINAPI UnmapDebugInformation(
PIMAGE_DEBUG_INFORMATION DebugInfo) PIMAGE_DEBUG_INFORMATION DebugInfo)
{ {
FIXME(imagehlp, "(%p): stub\n", DebugInfo); FIXME("(%p): stub\n", DebugInfo);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }

8
dlls/imagehlp/imagehlp_main.c
View file

@ -8,7 +8,7 @@
#include "winerror.h" #include "winerror.h"
#include "winbase.h" #include "winbase.h"
#include "windef.h" #include "windef.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(imagehlp) DEFAULT_DEBUG_CHANNEL(imagehlp)
@ -72,7 +72,7 @@ PAPI_VERSION WINAPI ImagehlpApiVersionEx(PAPI_VERSION AppVersion)
*/ */
BOOL WINAPI MakeSureDirectoryPathExists(LPCSTR DirPath) BOOL WINAPI MakeSureDirectoryPathExists(LPCSTR DirPath)
{ {
FIXME(imagehlp, "(%s): stub\n", debugstr_a(DirPath)); FIXME("(%s): stub\n", debugstr_a(DirPath));
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
@ -89,7 +89,7 @@ BOOL WINAPI MakeSureDirectoryPathExists(LPCSTR DirPath)
BOOL WINAPI SearchTreeForFile( BOOL WINAPI SearchTreeForFile(
LPSTR RootPath, LPSTR InputPathName, LPSTR OutputPathBuffer) LPSTR RootPath, LPSTR InputPathName, LPSTR OutputPathBuffer)
{ {
FIXME(imagehlp, "(%s, %s, %s): stub\n", FIXME("(%s, %s, %s): stub\n",
debugstr_a(RootPath), debugstr_a(InputPathName), debugstr_a(RootPath), debugstr_a(InputPathName),
debugstr_a(OutputPathBuffer) debugstr_a(OutputPathBuffer)
); );
@ -103,7 +103,7 @@ BOOL WINAPI SearchTreeForFile(
BOOL WINAPI TouchFileTimes( BOOL WINAPI TouchFileTimes(
HANDLE FileHandle, LPSYSTEMTIME lpSystemTime) HANDLE FileHandle, LPSYSTEMTIME lpSystemTime)
{ {
FIXME(imagehlp, "(0x%08x, %p): stub\n", FIXME("(0x%08x, %p): stub\n",
FileHandle, lpSystemTime FileHandle, lpSystemTime
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

14
dlls/imagehlp/integrity.c
View file

@ -8,7 +8,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "imagehlp.h" #include "imagehlp.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(imagehlp) DEFAULT_DEBUG_CHANNEL(imagehlp)
@ -19,7 +19,7 @@ DEFAULT_DEBUG_CHANNEL(imagehlp)
BOOL WINAPI ImageAddCertificate( BOOL WINAPI ImageAddCertificate(
HANDLE FileHandle, PWIN_CERTIFICATE Certificate, PDWORD Index) HANDLE FileHandle, PWIN_CERTIFICATE Certificate, PDWORD Index)
{ {
FIXME(imagehlp, "(0x%08x, %p, %p): stub\n", FIXME("(0x%08x, %p, %p): stub\n",
FileHandle, Certificate, Index FileHandle, Certificate, Index
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -33,7 +33,7 @@ BOOL WINAPI ImageEnumerateCertificates(
HANDLE FileHandle, WORD TypeFilter, PDWORD CertificateCount, HANDLE FileHandle, WORD TypeFilter, PDWORD CertificateCount,
PDWORD Indices, DWORD IndexCount) PDWORD Indices, DWORD IndexCount)
{ {
FIXME(imagehlp, "(0x%08x, %hd, %p, %p, %ld): stub\n", FIXME("(0x%08x, %hd, %p, %p, %ld): stub\n",
FileHandle, TypeFilter, CertificateCount, Indices, IndexCount FileHandle, TypeFilter, CertificateCount, Indices, IndexCount
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -47,7 +47,7 @@ BOOL WINAPI ImageGetCertificateData(
HANDLE FileHandle, DWORD CertificateIndex, HANDLE FileHandle, DWORD CertificateIndex,
PWIN_CERTIFICATE Certificate, PDWORD RequiredLength) PWIN_CERTIFICATE Certificate, PDWORD RequiredLength)
{ {
FIXME(imagehlp, "(0x%08x, %ld, %p, %p): stub\n", FIXME("(0x%08x, %ld, %p, %p): stub\n",
FileHandle, CertificateIndex, Certificate, RequiredLength FileHandle, CertificateIndex, Certificate, RequiredLength
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -61,7 +61,7 @@ BOOL WINAPI ImageGetCertificateHeader(
HANDLE FileHandle, DWORD CertificateIndex, HANDLE FileHandle, DWORD CertificateIndex,
PWIN_CERTIFICATE Certificateheader) PWIN_CERTIFICATE Certificateheader)
{ {
FIXME(imagehlp, "(0x%08x, %ld, %p): stub\n", FIXME("(0x%08x, %ld, %p): stub\n",
FileHandle, CertificateIndex, Certificateheader FileHandle, CertificateIndex, Certificateheader
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -75,7 +75,7 @@ BOOL WINAPI ImageGetDigestStream(
HANDLE FileHandle, DWORD DigestLevel, HANDLE FileHandle, DWORD DigestLevel,
DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle) DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle)
{ {
FIXME(imagehlp, "(%0x08x, %ld, %p, %p): stub\n", FIXME("(%0x08x, %ld, %p, %p): stub\n",
FileHandle, DigestLevel, DigestFunction, DigestHandle FileHandle, DigestLevel, DigestFunction, DigestHandle
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -87,7 +87,7 @@ BOOL WINAPI ImageGetDigestStream(
*/ */
BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index) BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index)
{ {
FIXME(imagehlp, "(0x%08x, %ld): stub\n", FileHandle, Index); FIXME("(0x%08x, %ld): stub\n", FileHandle, Index);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }

2
dlls/imagehlp/internal.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "debug.h" #include "debugtools.h"
#include "imagehlp.h" #include "imagehlp.h"
/*********************************************************************** /***********************************************************************

22
dlls/imagehlp/modify.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "debug.h" #include "debugtools.h"
#include "imagehlp.h" #include "imagehlp.h"
DEFAULT_DEBUG_CHANNEL(imagehlp) DEFAULT_DEBUG_CHANNEL(imagehlp)
@ -28,7 +28,7 @@ BOOL WINAPI BindImageEx(
DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath, DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath,
PIMAGEHLP_STATUS_ROUTINE StatusRoutine) PIMAGEHLP_STATUS_ROUTINE StatusRoutine)
{ {
FIXME(imagehlp, "(%ld, %s, %s, %s, %p): stub\n", FIXME("(%ld, %s, %s, %s, %p): stub\n",
Flags, debugstr_a(ImageName), debugstr_a(DllPath), Flags, debugstr_a(ImageName), debugstr_a(DllPath),
debugstr_a(SymbolPath), StatusRoutine debugstr_a(SymbolPath), StatusRoutine
); );
@ -43,7 +43,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile(
LPVOID BaseAddress, DWORD FileLength, LPVOID BaseAddress, DWORD FileLength,
LPDWORD HeaderSum, LPDWORD CheckSum) LPDWORD HeaderSum, LPDWORD CheckSum)
{ {
FIXME(imagehlp, "(%p, %ld, %p, %p): stub\n", FIXME("(%p, %ld, %p, %p): stub\n",
BaseAddress, FileLength, HeaderSum, CheckSum BaseAddress, FileLength, HeaderSum, CheckSum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -56,7 +56,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile(
DWORD WINAPI MapFileAndCheckSumA( DWORD WINAPI MapFileAndCheckSumA(
LPSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum) LPSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum)
{ {
FIXME(imagehlp, "(%s, %p, %p): stub\n", FIXME("(%s, %p, %p): stub\n",
debugstr_a(Filename), HeaderSum, CheckSum debugstr_a(Filename), HeaderSum, CheckSum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -69,7 +69,7 @@ DWORD WINAPI MapFileAndCheckSumA(
DWORD WINAPI MapFileAndCheckSumW( DWORD WINAPI MapFileAndCheckSumW(
LPWSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum) LPWSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum)
{ {
FIXME(imagehlp, "(%s, %p, %p): stub\n", FIXME("(%s, %p, %p): stub\n",
debugstr_w(Filename), HeaderSum, CheckSum debugstr_w(Filename), HeaderSum, CheckSum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -85,7 +85,7 @@ BOOL WINAPI ReBaseImage(
ULONG *OldImageSize, ULONG *OldImageBase, ULONG *NewImageSize, ULONG *OldImageSize, ULONG *OldImageBase, ULONG *NewImageSize,
ULONG *NewImageBase, ULONG TimeStamp) ULONG *NewImageBase, ULONG TimeStamp)
{ {
FIXME(imagehlp, FIXME(
"(%s, %s, %d, %d, %d, %ld, %p, %p, %p, %p, %ld): stub\n", "(%s, %s, %d, %d, %d, %ld, %p, %p, %p, %p, %ld): stub\n",
debugstr_a(CurrentImageName),debugstr_a(SymbolPath), fReBase, debugstr_a(CurrentImageName),debugstr_a(SymbolPath), fReBase,
fRebaseSysfileOk, fGoingDown, CheckImageSize, OldImageSize, fRebaseSysfileOk, fGoingDown, CheckImageSize, OldImageSize,
@ -101,7 +101,7 @@ BOOL WINAPI ReBaseImage(
BOOL WINAPI RemovePrivateCvSymbolic( BOOL WINAPI RemovePrivateCvSymbolic(
PCHAR DebugData, PCHAR *NewDebugData, ULONG *NewDebugSize) PCHAR DebugData, PCHAR *NewDebugData, ULONG *NewDebugSize)
{ {
FIXME(imagehlp, "(%p, %p, %p): stub\n", FIXME("(%p, %p, %p): stub\n",
DebugData, NewDebugData, NewDebugSize DebugData, NewDebugData, NewDebugSize
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -113,7 +113,7 @@ BOOL WINAPI RemovePrivateCvSymbolic(
*/ */
VOID WINAPI RemoveRelocations(PCHAR ImageName) VOID WINAPI RemoveRelocations(PCHAR ImageName)
{ {
FIXME(imagehlp, "(%p): stub\n", ImageName); FIXME("(%p): stub\n", ImageName);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
} }
@ -124,7 +124,7 @@ BOOL WINAPI SplitSymbols(
LPSTR ImageName, LPSTR SymbolsPath, LPSTR ImageName, LPSTR SymbolsPath,
LPSTR SymbolFilePath, DWORD Flags) LPSTR SymbolFilePath, DWORD Flags)
{ {
FIXME(imagehlp, "(%s, %s, %s, %ld): stub\n", FIXME("(%s, %s, %s, %ld): stub\n",
debugstr_a(ImageName), debugstr_a(SymbolsPath), debugstr_a(ImageName), debugstr_a(SymbolsPath),
debugstr_a(SymbolFilePath), Flags debugstr_a(SymbolFilePath), Flags
); );
@ -139,7 +139,7 @@ BOOL WINAPI UpdateDebugInfoFile(
LPSTR ImageFileName, LPSTR SymbolPath, LPSTR ImageFileName, LPSTR SymbolPath,
LPSTR DebugFilePath, PIMAGE_NT_HEADERS NtHeaders) LPSTR DebugFilePath, PIMAGE_NT_HEADERS NtHeaders)
{ {
FIXME(imagehlp, "(%s, %s, %s, %p): stub\n", FIXME("(%s, %s, %s, %p): stub\n",
debugstr_a(ImageFileName), debugstr_a(SymbolPath), debugstr_a(ImageFileName), debugstr_a(SymbolPath),
debugstr_a(DebugFilePath), NtHeaders debugstr_a(DebugFilePath), NtHeaders
); );
@ -156,7 +156,7 @@ BOOL WINAPI UpdateDebugInfoFileEx(
LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath, LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath,
PIMAGE_NT_HEADERS NtHeaders, DWORD OldChecksum) PIMAGE_NT_HEADERS NtHeaders, DWORD OldChecksum)
{ {
FIXME(imagehlp, "(%s, %s, %s, %p, %ld): stub\n", FIXME("(%s, %s, %s, %p, %ld): stub\n",
debugstr_a(ImageFileName), debugstr_a(SymbolPath), debugstr_a(ImageFileName), debugstr_a(SymbolPath),
debugstr_a(DebugFilePath), NtHeaders, OldChecksum debugstr_a(DebugFilePath), NtHeaders, OldChecksum
); );

40
dlls/imagehlp/symbol.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "debug.h" #include "debugtools.h"
#include "imagehlp.h" #include "imagehlp.h"
DEFAULT_DEBUG_CHANNEL(imagehlp) DEFAULT_DEBUG_CHANNEL(imagehlp)
@ -17,7 +17,7 @@ DEFAULT_DEBUG_CHANNEL(imagehlp)
*/ */
BOOL WINAPI SymCleanup(HANDLE hProcess) BOOL WINAPI SymCleanup(HANDLE hProcess)
{ {
FIXME(imagehlp, "(0x%08x): stub\n", hProcess); FIXME("(0x%08x): stub\n", hProcess);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
@ -30,7 +30,7 @@ BOOL WINAPI SymEnumerateModules(
HANDLE hProcess, PSYM_ENUMMODULES_CALLBACK EnumModulesCallback, HANDLE hProcess, PSYM_ENUMMODULES_CALLBACK EnumModulesCallback,
PVOID UserContext) PVOID UserContext)
{ {
FIXME(imagehlp, "(0x%08x, %p, %p): stub\n", FIXME("(0x%08x, %p, %p): stub\n",
hProcess, EnumModulesCallback, UserContext hProcess, EnumModulesCallback, UserContext
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -44,7 +44,7 @@ BOOL WINAPI SymEnumerateSymbols(
HANDLE hProcess, DWORD BaseOfDll, HANDLE hProcess, DWORD BaseOfDll,
PSYM_ENUMSYMBOLS_CALLBACK EnumSymbolsCallback, PVOID UserContext) PSYM_ENUMSYMBOLS_CALLBACK EnumSymbolsCallback, PVOID UserContext)
{ {
FIXME(imagehlp, "(0x%08x, %p, %p): stub\n", FIXME("(0x%08x, %p, %p): stub\n",
hProcess, EnumSymbolsCallback, UserContext hProcess, EnumSymbolsCallback, UserContext
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -56,7 +56,7 @@ BOOL WINAPI SymEnumerateSymbols(
*/ */
PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase) PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase)
{ {
FIXME(imagehlp, "(0x%08x, 0x%08lx): stub\n", hProcess, AddrBase); FIXME("(0x%08x, 0x%08lx): stub\n", hProcess, AddrBase);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
@ -66,7 +66,7 @@ PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase)
*/ */
DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr)
{ {
FIXME(imagehlp, "(0x%08x, 0x%08lx): stub\n", hProcess, dwAddr); FIXME("(0x%08x, 0x%08lx): stub\n", hProcess, dwAddr);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; return 0;
} }
@ -78,7 +78,7 @@ BOOL WINAPI SymGetModuleInfo(
HANDLE hProcess, DWORD dwAddr, HANDLE hProcess, DWORD dwAddr,
PIMAGEHLP_MODULE ModuleInfo) PIMAGEHLP_MODULE ModuleInfo)
{ {
FIXME(imagehlp, "(0x%08x, 0x%08lx, %p): stub\n", FIXME("(0x%08x, 0x%08lx, %p): stub\n",
hProcess, dwAddr, ModuleInfo hProcess, dwAddr, ModuleInfo
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -90,7 +90,7 @@ BOOL WINAPI SymGetModuleInfo(
*/ */
DWORD WINAPI SymGetOptions() DWORD WINAPI SymGetOptions()
{ {
FIXME(imagehlp, "(): stub\n"); FIXME("(): stub\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; return 0;
} }
@ -101,7 +101,7 @@ DWORD WINAPI SymGetOptions()
BOOL WINAPI SymGetSearchPath( BOOL WINAPI SymGetSearchPath(
HANDLE hProcess, LPSTR szSearchPath, DWORD SearchPathLength) HANDLE hProcess, LPSTR szSearchPath, DWORD SearchPathLength)
{ {
FIXME(imagehlp, "(0x%08x, %s, %ld): stub\n", FIXME("(0x%08x, %s, %ld): stub\n",
hProcess, debugstr_an(szSearchPath,SearchPathLength), SearchPathLength hProcess, debugstr_an(szSearchPath,SearchPathLength), SearchPathLength
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -115,7 +115,7 @@ BOOL WINAPI SymGetSymFromAddr(
HANDLE hProcess, DWORD dwAddr, HANDLE hProcess, DWORD dwAddr,
PDWORD pdwDisplacement, PIMAGEHLP_SYMBOL Symbol) PDWORD pdwDisplacement, PIMAGEHLP_SYMBOL Symbol)
{ {
FIXME(imagehlp, "(0x%08x, 0x%08lx, %p, %p): stub\n", FIXME("(0x%08x, 0x%08lx, %p, %p): stub\n",
hProcess, dwAddr, pdwDisplacement, Symbol hProcess, dwAddr, pdwDisplacement, Symbol
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -128,7 +128,7 @@ BOOL WINAPI SymGetSymFromAddr(
BOOL WINAPI SymGetSymFromName( BOOL WINAPI SymGetSymFromName(
HANDLE hProcess, LPSTR Name, PIMAGEHLP_SYMBOL Symbol) HANDLE hProcess, LPSTR Name, PIMAGEHLP_SYMBOL Symbol)
{ {
FIXME(imagehlp, "(0x%08x, %s, %p): stub\n", hProcess, Name, Symbol); FIXME("(0x%08x, %s, %p): stub\n", hProcess, Name, Symbol);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
@ -139,7 +139,7 @@ BOOL WINAPI SymGetSymFromName(
BOOL WINAPI SymGetSymNext( BOOL WINAPI SymGetSymNext(
HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol) HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol)
{ {
FIXME(imagehlp, "(0x%08x, %p): stub\n", hProcess, Symbol); FIXME("(0x%08x, %p): stub\n", hProcess, Symbol);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
@ -151,7 +151,7 @@ BOOL WINAPI SymGetSymNext(
BOOL WINAPI SymGetSymPrev( BOOL WINAPI SymGetSymPrev(
HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol) HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol)
{ {
FIXME(imagehlp, "(0x%08x, %p): stub\n", hProcess, Symbol); FIXME("(0x%08x, %p): stub\n", hProcess, Symbol);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
@ -162,7 +162,7 @@ BOOL WINAPI SymGetSymPrev(
BOOL WINAPI SymInitialize( BOOL WINAPI SymInitialize(
HANDLE hProcess, LPSTR UserSearchPath, BOOL fInvadeProcess) HANDLE hProcess, LPSTR UserSearchPath, BOOL fInvadeProcess)
{ {
FIXME(imagehlp, "(0x%08x, %s, %d): stub\n", FIXME("(0x%08x, %s, %d): stub\n",
hProcess, debugstr_a(UserSearchPath), fInvadeProcess hProcess, debugstr_a(UserSearchPath), fInvadeProcess
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -177,7 +177,7 @@ BOOL WINAPI SymLoadModule(
HANDLE hProcess, HANDLE hFile, LPSTR ImageName, LPSTR ModuleName, HANDLE hProcess, HANDLE hFile, LPSTR ImageName, LPSTR ModuleName,
DWORD BaseOfDll, DWORD SizeOfDll) DWORD BaseOfDll, DWORD SizeOfDll)
{ {
FIXME(imagehlp, "(0x%08x, 0x%08x, %s, %s, %ld, %ld): stub\n", FIXME("(0x%08x, 0x%08x, %s, %s, %ld, %ld): stub\n",
hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName), hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName),
BaseOfDll, SizeOfDll BaseOfDll, SizeOfDll
); );
@ -192,7 +192,7 @@ BOOL WINAPI SymRegisterCallback(
HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK CallbackFunction, HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK CallbackFunction,
PVOID UserContext) PVOID UserContext)
{ {
FIXME(imagehlp, "(0x%08x, %p, %p): stub\n", FIXME("(0x%08x, %p, %p): stub\n",
hProcess, CallbackFunction, UserContext hProcess, CallbackFunction, UserContext
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -204,7 +204,7 @@ BOOL WINAPI SymRegisterCallback(
*/ */
DWORD WINAPI SymSetOptions(DWORD SymOptions) DWORD WINAPI SymSetOptions(DWORD SymOptions)
{ {
FIXME(imagehlp, "(%lx): stub\n", SymOptions); FIXME("(%lx): stub\n", SymOptions);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; return 0;
} }
@ -214,7 +214,7 @@ DWORD WINAPI SymSetOptions(DWORD SymOptions)
*/ */
BOOL WINAPI SymSetSearchPath(HANDLE hProcess, LPSTR szSearchPath) BOOL WINAPI SymSetSearchPath(HANDLE hProcess, LPSTR szSearchPath)
{ {
FIXME(imagehlp, "(0x%08x, %s): stub\n", FIXME("(0x%08x, %s): stub\n",
hProcess, debugstr_a(szSearchPath) hProcess, debugstr_a(szSearchPath)
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -227,7 +227,7 @@ BOOL WINAPI SymSetSearchPath(HANDLE hProcess, LPSTR szSearchPath)
BOOL WINAPI SymUnDName( BOOL WINAPI SymUnDName(
PIMAGEHLP_SYMBOL sym, LPSTR UnDecName, DWORD UnDecNameLength) PIMAGEHLP_SYMBOL sym, LPSTR UnDecName, DWORD UnDecNameLength)
{ {
FIXME(imagehlp, "(%p, %s, %ld): stub\n", FIXME("(%p, %s, %ld): stub\n",
sym, UnDecName, UnDecNameLength sym, UnDecName, UnDecNameLength
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -240,7 +240,7 @@ BOOL WINAPI SymUnDName(
BOOL WINAPI SymUnloadModule( BOOL WINAPI SymUnloadModule(
HANDLE hProcess, DWORD BaseOfDll) HANDLE hProcess, DWORD BaseOfDll)
{ {
FIXME(imagehlp, "(0x%08x, 0x%08lx): stub\n", hProcess, BaseOfDll); FIXME("(0x%08x, 0x%08lx): stub\n", hProcess, BaseOfDll);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }

60
dlls/msacm/msacm_main.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "msacm.h" #include "msacm.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(msacm) DEFAULT_DEBUG_CHANNEL(msacm)
@ -16,7 +16,7 @@ DEFAULT_DEBUG_CHANNEL(msacm)
*/ */
DWORD WINAPI acmGetVersion16() DWORD WINAPI acmGetVersion16()
{ {
FIXME(msacm, "(): stub\n"); FIXME("(): stub\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; /* FIXME */ return 0; /* FIXME */
} }
@ -28,7 +28,7 @@ DWORD WINAPI acmGetVersion16()
MMRESULT16 WINAPI acmMetrics16( MMRESULT16 WINAPI acmMetrics16(
HACMOBJ16 hao, UINT16 uMetric, LPVOID pMetric) HACMOBJ16 hao, UINT16 uMetric, LPVOID pMetric)
{ {
FIXME(msacm, "(0x%04x, %d, %p): stub\n", hao, uMetric, pMetric); FIXME("(0x%04x, %d, %p): stub\n", hao, uMetric, pMetric);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -39,7 +39,7 @@ MMRESULT16 WINAPI acmMetrics16(
MMRESULT16 WINAPI acmDriverEnum16( MMRESULT16 WINAPI acmDriverEnum16(
ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(%p, %ld, %ld): stub\n", FIXME("(%p, %ld, %ld): stub\n",
fnCallback, dwInstance, fdwEnum fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -53,7 +53,7 @@ MMRESULT16 WINAPI acmDriverEnum16(
MMRESULT16 WINAPI acmDriverDetails16( MMRESULT16 WINAPI acmDriverDetails16(
HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails) HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%04x, %p, %ld): stub\n", hadid, padd, fdwDetails); FIXME("(0x%04x, %p, %ld): stub\n", hadid, padd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -65,7 +65,7 @@ MMRESULT16 WINAPI acmDriverAdd16(
LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule, LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule,
LPARAM lParam, DWORD dwPriority, DWORD fdwAdd) LPARAM lParam, DWORD dwPriority, DWORD fdwAdd)
{ {
FIXME(msacm, "(%p, 0x%04x, %ld, %ld, %ld): stub\n", FIXME("(%p, 0x%04x, %ld, %ld, %ld): stub\n",
phadid, hinstModule, lParam, dwPriority, fdwAdd phadid, hinstModule, lParam, dwPriority, fdwAdd
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -78,7 +78,7 @@ MMRESULT16 WINAPI acmDriverAdd16(
MMRESULT16 WINAPI acmDriverRemove16( MMRESULT16 WINAPI acmDriverRemove16(
HACMDRIVERID16 hadid, DWORD fdwRemove) HACMDRIVERID16 hadid, DWORD fdwRemove)
{ {
FIXME(msacm, "(0x%04x, %ld): stub\n", hadid, fdwRemove); FIXME("(0x%04x, %ld): stub\n", hadid, fdwRemove);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -89,7 +89,7 @@ MMRESULT16 WINAPI acmDriverRemove16(
MMRESULT16 WINAPI acmDriverOpen16( MMRESULT16 WINAPI acmDriverOpen16(
LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen) LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen)
{ {
FIXME(msacm, "(%p, 0x%04x, %ld): stub\n", phad, hadid, fdwOpen); FIXME("(%p, 0x%04x, %ld): stub\n", phad, hadid, fdwOpen);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -100,7 +100,7 @@ MMRESULT16 WINAPI acmDriverOpen16(
MMRESULT16 WINAPI acmDriverClose16( MMRESULT16 WINAPI acmDriverClose16(
HACMDRIVER16 had, DWORD fdwClose) HACMDRIVER16 had, DWORD fdwClose)
{ {
FIXME(msacm, "(0x%04x, %ld): stub\n", had, fdwClose); FIXME("(0x%04x, %ld): stub\n", had, fdwClose);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -111,7 +111,7 @@ MMRESULT16 WINAPI acmDriverClose16(
LRESULT WINAPI acmDriverMessage16( LRESULT WINAPI acmDriverMessage16(
HACMDRIVER16 had, UINT16 uMsg, LPARAM lParam1, LPARAM lParam2) HACMDRIVER16 had, UINT16 uMsg, LPARAM lParam1, LPARAM lParam2)
{ {
FIXME(msacm, "(0x%04x, %d, %ld, %ld): stub\n", FIXME("(0x%04x, %d, %ld, %ld): stub\n",
had, uMsg, lParam1, lParam2 had, uMsg, lParam1, lParam2
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -124,7 +124,7 @@ LRESULT WINAPI acmDriverMessage16(
MMRESULT16 WINAPI acmDriverID16( MMRESULT16 WINAPI acmDriverID16(
HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID) HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID)
{ {
FIXME(msacm, "(0x%04x, %p, %ld): stub\n", hao, phadid, fdwDriverID); FIXME("(0x%04x, %p, %ld): stub\n", hao, phadid, fdwDriverID);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -135,7 +135,7 @@ MMRESULT16 WINAPI acmDriverID16(
MMRESULT16 WINAPI acmDriverPriority16( MMRESULT16 WINAPI acmDriverPriority16(
HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority) HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority)
{ {
FIXME(msacm, "(0x%04x, %ld, %ld): stub\n", FIXME("(0x%04x, %ld, %ld): stub\n",
hadid, dwPriority, fdwPriority hadid, dwPriority, fdwPriority
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -148,7 +148,7 @@ MMRESULT16 WINAPI acmDriverPriority16(
MMRESULT16 WINAPI acmFormatTagDetails16( MMRESULT16 WINAPI acmFormatTagDetails16(
HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails) HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -160,7 +160,7 @@ MMRESULT16 WINAPI acmFormatTagEnum16(
HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd,
ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%04x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
had, paftd, fnCallback, dwInstance, fdwEnum had, paftd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -173,7 +173,7 @@ MMRESULT16 WINAPI acmFormatTagEnum16(
MMRESULT16 WINAPI acmFormatChoose16( MMRESULT16 WINAPI acmFormatChoose16(
LPACMFORMATCHOOSE16 pafmtc) LPACMFORMATCHOOSE16 pafmtc)
{ {
FIXME(msacm, "(%p): stub\n", pafmtc); FIXME("(%p): stub\n", pafmtc);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -184,7 +184,7 @@ MMRESULT16 WINAPI acmFormatChoose16(
MMRESULT16 WINAPI acmFormatDetails16( MMRESULT16 WINAPI acmFormatDetails16(
HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails) HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -196,7 +196,7 @@ MMRESULT16 WINAPI acmFormatEnum16(
HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd,
ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%04x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
had, pafd, fnCallback, dwInstance, fdwEnum had, pafd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -210,7 +210,7 @@ MMRESULT16 WINAPI acmFormatSuggest16(
HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc,
LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest)
{ {
FIXME(msacm, "(0x%04x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -223,7 +223,7 @@ MMRESULT16 WINAPI acmFormatSuggest16(
MMRESULT16 WINAPI acmFilterTagDetails16( MMRESULT16 WINAPI acmFilterTagDetails16(
HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails) HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -235,7 +235,7 @@ MMRESULT16 WINAPI acmFilterTagEnum16(
HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd,
ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%04x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
had, paftd, fnCallback, dwInstance, fdwEnum had, paftd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -248,7 +248,7 @@ MMRESULT16 WINAPI acmFilterTagEnum16(
MMRESULT16 WINAPI acmFilterChoose16( MMRESULT16 WINAPI acmFilterChoose16(
LPACMFILTERCHOOSE16 pafltrc) LPACMFILTERCHOOSE16 pafltrc)
{ {
FIXME(msacm, "(%p): stub\n", pafltrc); FIXME("(%p): stub\n", pafltrc);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -259,7 +259,7 @@ MMRESULT16 WINAPI acmFilterChoose16(
MMRESULT16 WINAPI acmFilterDetails16( MMRESULT16 WINAPI acmFilterDetails16(
HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails) HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -271,7 +271,7 @@ MMRESULT16 WINAPI acmFilterEnum16(
HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd,
ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%04x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
had, pafd, fnCallback, dwInstance, fdwEnum had, pafd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -287,7 +287,7 @@ MMRESULT16 WINAPI acmStreamOpen16(
LPWAVEFILTER pwfltr, DWORD dwCallback, LPWAVEFILTER pwfltr, DWORD dwCallback,
DWORD dwInstance, DWORD fdwOpen) DWORD dwInstance, DWORD fdwOpen)
{ {
FIXME(msacm, "(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n", FIXME("(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n",
phas, had, pwfxSrc, pwfxDst, pwfltr, phas, had, pwfxSrc, pwfxDst, pwfltr,
dwCallback, dwInstance, fdwOpen dwCallback, dwInstance, fdwOpen
); );
@ -301,7 +301,7 @@ MMRESULT16 WINAPI acmStreamOpen16(
MMRESULT16 WINAPI acmStreamClose16( MMRESULT16 WINAPI acmStreamClose16(
HACMSTREAM16 has, DWORD fdwClose) HACMSTREAM16 has, DWORD fdwClose)
{ {
FIXME(msacm, "(0x%04x, %ld): stub\n", has, fdwClose); FIXME("(0x%04x, %ld): stub\n", has, fdwClose);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -313,7 +313,7 @@ MMRESULT16 WINAPI acmStreamSize16(
HACMSTREAM16 has, DWORD cbInput, HACMSTREAM16 has, DWORD cbInput,
LPDWORD pdwOutputBytes, DWORD fdwSize) LPDWORD pdwOutputBytes, DWORD fdwSize)
{ {
FIXME(msacm, "(0x%04x, %ld, %p, %ld): stub\n", FIXME("(0x%04x, %ld, %p, %ld): stub\n",
has, cbInput, pdwOutputBytes, fdwSize has, cbInput, pdwOutputBytes, fdwSize
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -326,7 +326,7 @@ MMRESULT16 WINAPI acmStreamSize16(
MMRESULT16 WINAPI acmStreamConvert16( MMRESULT16 WINAPI acmStreamConvert16(
HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert) HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert)
{ {
FIXME(msacm, "(0x%04x, %p, %ld): stub\n", has, pash, fdwConvert); FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwConvert);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -337,7 +337,7 @@ MMRESULT16 WINAPI acmStreamConvert16(
MMRESULT16 WINAPI acmStreamReset16( MMRESULT16 WINAPI acmStreamReset16(
HACMSTREAM16 has, DWORD fdwReset) HACMSTREAM16 has, DWORD fdwReset)
{ {
FIXME(msacm, "(0x%04x, %ld): stub\n", has, fdwReset); FIXME("(0x%04x, %ld): stub\n", has, fdwReset);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -348,7 +348,7 @@ MMRESULT16 WINAPI acmStreamReset16(
MMRESULT16 WINAPI acmStreamPrepareHeader16( MMRESULT16 WINAPI acmStreamPrepareHeader16(
HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare) HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare)
{ {
FIXME(msacm, "(0x%04x, %p, %ld): stub\n", has, pash, fdwPrepare); FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwPrepare);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -359,7 +359,7 @@ MMRESULT16 WINAPI acmStreamPrepareHeader16(
MMRESULT16 WINAPI acmStreamUnprepareHeader16( MMRESULT16 WINAPI acmStreamUnprepareHeader16(
HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare) HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare)
{ {
FIXME(msacm, "(0x%04x, %p, %ld): stub\n", FIXME("(0x%04x, %p, %ld): stub\n",
has, pash, fdwUnprepare has, pash, fdwUnprepare
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

2
dlls/msacm32/builtin.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "debug.h" #include "debugtools.h"
#include "driver.h" #include "driver.h"
#include "heap.h" #include "heap.h"
#include "mmsystem.h" #include "mmsystem.h"

10
dlls/msacm32/driver.c
View file

@ -8,7 +8,7 @@
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "winuser.h" #include "winuser.h"
#include "debug.h" #include "debugtools.h"
#include "driver.h" #include "driver.h"
#include "heap.h" #include "heap.h"
#include "mmsystem.h" #include "mmsystem.h"
@ -59,7 +59,7 @@ MMRESULT WINAPI acmDriverAddW(
PHACMDRIVERID phadid, HINSTANCE hinstModule, PHACMDRIVERID phadid, HINSTANCE hinstModule,
LPARAM lParam, DWORD dwPriority, DWORD fdwAdd) LPARAM lParam, DWORD dwPriority, DWORD fdwAdd)
{ {
FIXME(msacm, "(%p, 0x%08x, %ld, %ld, %ld): stub\n", FIXME("(%p, 0x%08x, %ld, %ld, %ld): stub\n",
phadid, hinstModule, lParam, dwPriority, fdwAdd phadid, hinstModule, lParam, dwPriority, fdwAdd
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -143,7 +143,7 @@ MMRESULT WINAPI acmDriverDetailsA(
MMRESULT WINAPI acmDriverDetailsW( MMRESULT WINAPI acmDriverDetailsW(
HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, DWORD fdwDetails) HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%08x, %p, %ld): stub\n", hadid, padd, fdwDetails); FIXME("(0x%08x, %p, %ld): stub\n", hadid, padd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -241,7 +241,7 @@ MMRESULT WINAPI acmDriverOpen(
if(padid->pACMDriver) if(padid->pACMDriver)
{ {
/* FIXME: Is it allowed? */ /* FIXME: Is it allowed? */
ERR(msacm, "Can't open driver twice\n"); ERR("Can't open driver twice\n");
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -319,7 +319,7 @@ MMRESULT WINAPI acmDriverPriority(
if(lError != ERROR_SUCCESS) if(lError != ERROR_SUCCESS)
break; break;
FIXME(msacm, "(0x%08x, %ld, %ld): stub (partial)\n", FIXME("(0x%08x, %ld, %ld): stub (partial)\n",
hadid, dwPriority, fdwPriority hadid, dwPriority, fdwPriority
); );
break; break;

18
dlls/msacm32/filter.c
View file

@ -9,7 +9,7 @@
#include "mmsystem.h" #include "mmsystem.h"
#include "msacm.h" #include "msacm.h"
#include "msacmdrv.h" #include "msacmdrv.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(msacm) DEFAULT_DEBUG_CHANNEL(msacm)
@ -19,7 +19,7 @@ DEFAULT_DEBUG_CHANNEL(msacm)
MMRESULT WINAPI acmFilterChooseA( MMRESULT WINAPI acmFilterChooseA(
PACMFILTERCHOOSEA pafltrc) PACMFILTERCHOOSEA pafltrc)
{ {
FIXME(msacm, "(%p): stub\n", pafltrc); FIXME("(%p): stub\n", pafltrc);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -30,7 +30,7 @@ MMRESULT WINAPI acmFilterChooseA(
MMRESULT WINAPI acmFilterChooseW( MMRESULT WINAPI acmFilterChooseW(
PACMFILTERCHOOSEW pafltrc) PACMFILTERCHOOSEW pafltrc)
{ {
FIXME(msacm, "(%p): stub\n", pafltrc); FIXME("(%p): stub\n", pafltrc);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -61,7 +61,7 @@ MMRESULT WINAPI acmFilterDetailsA(
MMRESULT WINAPI acmFilterDetailsW( MMRESULT WINAPI acmFilterDetailsW(
HACMDRIVER had, PACMFILTERDETAILSW pafd, DWORD fdwDetails) HACMDRIVER had, PACMFILTERDETAILSW pafd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%08x, %p, %ld): stub\n", had, pafd, fdwDetails); FIXME("(0x%08x, %p, %ld): stub\n", had, pafd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -73,7 +73,7 @@ MMRESULT WINAPI acmFilterEnumA(
HACMDRIVER had, PACMFILTERDETAILSA pafd, HACMDRIVER had, PACMFILTERDETAILSA pafd,
ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
had, pafd, fnCallback, dwInstance, fdwEnum had, pafd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -87,7 +87,7 @@ MMRESULT WINAPI acmFilterEnumW(
HACMDRIVER had, PACMFILTERDETAILSW pafd, HACMDRIVER had, PACMFILTERDETAILSW pafd,
ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
had, pafd, fnCallback, dwInstance, fdwEnum had, pafd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -122,7 +122,7 @@ MMRESULT WINAPI acmFilterTagDetailsA(
MMRESULT WINAPI acmFilterTagDetailsW( MMRESULT WINAPI acmFilterTagDetailsW(
HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, DWORD fdwDetails) HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%08x, %p, %ld): stub\n", had, paftd, fdwDetails); FIXME("(0x%08x, %p, %ld): stub\n", had, paftd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -134,7 +134,7 @@ MMRESULT WINAPI acmFilterTagEnumA(
HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, HACMDRIVER had, PACMFILTERTAGDETAILSA paftd,
ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
had, paftd, fnCallback, dwInstance, fdwEnum had, paftd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -148,7 +148,7 @@ MMRESULT WINAPI acmFilterTagEnumW(
HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
had, paftd, fnCallback, dwInstance, fdwEnum had, paftd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

20
dlls/msacm32/format.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "debug.h" #include "debugtools.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "msacm.h" #include "msacm.h"
#include "msacmdrv.h" #include "msacmdrv.h"
@ -20,7 +20,7 @@ DEFAULT_DEBUG_CHANNEL(msacm)
MMRESULT WINAPI acmFormatChooseA( MMRESULT WINAPI acmFormatChooseA(
PACMFORMATCHOOSEA pafmtc) PACMFORMATCHOOSEA pafmtc)
{ {
FIXME(msacm, "(%p): stub\n", pafmtc); FIXME("(%p): stub\n", pafmtc);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -31,7 +31,7 @@ MMRESULT WINAPI acmFormatChooseA(
MMRESULT WINAPI acmFormatChooseW( MMRESULT WINAPI acmFormatChooseW(
PACMFORMATCHOOSEW pafmtc) PACMFORMATCHOOSEW pafmtc)
{ {
FIXME(msacm, "(%p): stub\n", pafmtc); FIXME("(%p): stub\n", pafmtc);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -62,7 +62,7 @@ MMRESULT WINAPI acmFormatDetailsA(
MMRESULT WINAPI acmFormatDetailsW( MMRESULT WINAPI acmFormatDetailsW(
HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails) HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%08x, %p, %ld): stub\n", had, pafd, fdwDetails); FIXME("(0x%08x, %p, %ld): stub\n", had, pafd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -74,7 +74,7 @@ MMRESULT WINAPI acmFormatEnumA(
HACMDRIVER had, PACMFORMATDETAILSA pafd, HACMDRIVER had, PACMFORMATDETAILSA pafd,
ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
had, pafd, fnCallback, dwInstance, fdwEnum had, pafd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -88,7 +88,7 @@ MMRESULT WINAPI acmFormatEnumW(
HACMDRIVER had, PACMFORMATDETAILSW pafd, HACMDRIVER had, PACMFORMATDETAILSW pafd,
ACMFORMATENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFORMATENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
had, pafd, fnCallback, dwInstance, fdwEnum had, pafd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -102,7 +102,7 @@ MMRESULT WINAPI acmFormatSuggest(
HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst, HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
DWORD cbwfxDst, DWORD fdwSuggest) DWORD cbwfxDst, DWORD fdwSuggest)
{ {
FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -136,7 +136,7 @@ MMRESULT WINAPI acmFormatTagDetailsA(
MMRESULT WINAPI acmFormatTagDetailsW( MMRESULT WINAPI acmFormatTagDetailsW(
HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, DWORD fdwDetails) HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, DWORD fdwDetails)
{ {
FIXME(msacm, "(0x%08x, %p, %ld): stub\n", had, paftd, fdwDetails); FIXME("(0x%08x, %p, %ld): stub\n", had, paftd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -148,7 +148,7 @@ MMRESULT WINAPI acmFormatTagEnumA(
HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, HACMDRIVER had, PACMFORMATTAGDETAILSA paftd,
ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
had, paftd, fnCallback, dwInstance, fdwEnum had, paftd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -162,7 +162,7 @@ MMRESULT WINAPI acmFormatTagEnumW(
HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum) ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum)
{ {
FIXME(msacm, "(0x%08x, %p, %p, %ld, %ld): stub\n", FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
had, paftd, fnCallback, dwInstance, fdwEnum had, paftd, fnCallback, dwInstance, fdwEnum
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

2
dlls/msacm32/internal.c
View file

@ -12,7 +12,7 @@
#include "mmsystem.h" #include "mmsystem.h"
#include "msacm.h" #include "msacm.h"
#include "msacmdrv.h" #include "msacmdrv.h"
#include "debug.h" #include "debugtools.h"
/**********************************************************************/ /**********************************************************************/

6
dlls/msacm32/msacm32_main.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "debug.h" #include "debugtools.h"
#include "msacm.h" #include "msacm.h"
#include "msacmdrv.h" #include "msacmdrv.h"
#include "winversion.h" #include "winversion.h"
@ -67,7 +67,7 @@ DWORD WINAPI acmGetVersion()
switch(VERSION_GetVersion()) switch(VERSION_GetVersion())
{ {
default: default:
FIXME(msacm, "%s not supported\n", VERSION_GetVersionName()); FIXME("%s not supported\n", VERSION_GetVersionName());
case WIN95: case WIN95:
return 0x04000000; /* 4.0.0 */ return 0x04000000; /* 4.0.0 */
case NT40: case NT40:
@ -90,7 +90,7 @@ MMRESULT WINAPI acmMetrics(
PWINE_ACMOBJ pao = MSACM_GetObj(hao); PWINE_ACMOBJ pao = MSACM_GetObj(hao);
BOOL bLocal = TRUE; BOOL bLocal = TRUE;
FIXME(msacm, "(0x%08x, %d, %p): stub\n", hao, uMetric, pMetric); FIXME("(0x%08x, %d, %p): stub\n", hao, uMetric, pMetric);
switch(uMetric) switch(uMetric)
{ {

18
dlls/msacm32/stream.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "debug.h" #include "debugtools.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "msacm.h" #include "msacm.h"
#include "msacmdrv.h" #include "msacmdrv.h"
@ -20,7 +20,7 @@ DEFAULT_DEBUG_CHANNEL(msacm)
MMRESULT WINAPI acmStreamClose( MMRESULT WINAPI acmStreamClose(
HACMSTREAM has, DWORD fdwClose) HACMSTREAM has, DWORD fdwClose)
{ {
FIXME(msacm, "(0x%08x, %ld): stub\n", has, fdwClose); FIXME("(0x%08x, %ld): stub\n", has, fdwClose);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -31,7 +31,7 @@ MMRESULT WINAPI acmStreamClose(
MMRESULT WINAPI acmStreamConvert( MMRESULT WINAPI acmStreamConvert(
HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwConvert) HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwConvert)
{ {
FIXME(msacm, "(0x%08x, %p, %ld): stub\n", has, pash, fdwConvert); FIXME("(0x%08x, %p, %ld): stub\n", has, pash, fdwConvert);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -42,7 +42,7 @@ MMRESULT WINAPI acmStreamConvert(
MMRESULT WINAPI acmStreamMessage( MMRESULT WINAPI acmStreamMessage(
HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2) HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
{ {
FIXME(msacm, "(0x%08x, %u, %ld, %ld): stub\n", FIXME("(0x%08x, %u, %ld, %ld): stub\n",
has, uMsg, lParam1, lParam2 has, uMsg, lParam1, lParam2
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -57,7 +57,7 @@ MMRESULT WINAPI acmStreamOpen(
PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback, PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback,
DWORD dwInstance, DWORD fdwOpen) DWORD dwInstance, DWORD fdwOpen)
{ {
FIXME(msacm, "(%p, 0x%08x, %p, %p, %p, %ld, %ld, %ld): stub\n", FIXME("(%p, 0x%08x, %p, %p, %p, %ld, %ld, %ld): stub\n",
phas, had, pwfxSrc, pwfxDst, pwfltr, phas, had, pwfxSrc, pwfxDst, pwfltr,
dwCallback, dwInstance, fdwOpen dwCallback, dwInstance, fdwOpen
); );
@ -72,7 +72,7 @@ MMRESULT WINAPI acmStreamOpen(
MMRESULT WINAPI acmStreamPrepareHeader( MMRESULT WINAPI acmStreamPrepareHeader(
HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare) HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare)
{ {
FIXME(msacm, "(0x%08x, %p, %ld): stub\n", has, pash, fdwPrepare); FIXME("(0x%08x, %p, %ld): stub\n", has, pash, fdwPrepare);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -83,7 +83,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(
MMRESULT WINAPI acmStreamReset( MMRESULT WINAPI acmStreamReset(
HACMSTREAM has, DWORD fdwReset) HACMSTREAM has, DWORD fdwReset)
{ {
FIXME(msacm, "(0x%08x, %ld): stub\n", has, fdwReset); FIXME("(0x%08x, %ld): stub\n", has, fdwReset);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -95,7 +95,7 @@ MMRESULT WINAPI acmStreamSize(
HACMSTREAM has, DWORD cbInput, HACMSTREAM has, DWORD cbInput,
LPDWORD pdwOutputBytes, DWORD fdwSize) LPDWORD pdwOutputBytes, DWORD fdwSize)
{ {
FIXME(msacm, "(0x%08x, %ld, %p, %ld): stub\n", FIXME("(0x%08x, %ld, %p, %ld): stub\n",
has, cbInput, pdwOutputBytes, fdwSize has, cbInput, pdwOutputBytes, fdwSize
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -108,7 +108,7 @@ MMRESULT WINAPI acmStreamSize(
MMRESULT WINAPI acmStreamUnprepareHeader( MMRESULT WINAPI acmStreamUnprepareHeader(
HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare) HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare)
{ {
FIXME(msacm, "(0x%08x, %p, %ld): stub\n", FIXME("(0x%08x, %p, %ld): stub\n",
has, pash, fdwUnprepare has, pash, fdwUnprepare
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

38
dlls/psapi/psapi_main.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "windef.h" #include "windef.h"
#include "winerror.h" #include "winerror.h"
#include "debug.h" #include "debugtools.h"
#include "psapi.h" #include "psapi.h"
DEFAULT_DEBUG_CHANNEL(psapi) DEFAULT_DEBUG_CHANNEL(psapi)
@ -28,7 +28,7 @@ BOOL WINAPI EmptyWorkingSet(HANDLE hProcess)
BOOL WINAPI EnumDeviceDrivers( BOOL WINAPI EnumDeviceDrivers(
LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded) LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded)
{ {
FIXME(psapi, "(%p, %ld, %p): stub\n", lpImageBase, cb, lpcbNeeded); FIXME("(%p, %ld, %p): stub\n", lpImageBase, cb, lpcbNeeded);
if(lpcbNeeded) if(lpcbNeeded)
*lpcbNeeded = 0; *lpcbNeeded = 0;
@ -42,7 +42,7 @@ BOOL WINAPI EnumDeviceDrivers(
*/ */
BOOL WINAPI EnumProcesses(DWORD *lpidProcess, DWORD cb, DWORD *lpcbNeeded) BOOL WINAPI EnumProcesses(DWORD *lpidProcess, DWORD cb, DWORD *lpcbNeeded)
{ {
FIXME(psapi, "(%p, %ld, %p): stub\n", lpidProcess,cb, lpcbNeeded); FIXME("(%p, %ld, %p): stub\n", lpidProcess,cb, lpcbNeeded);
if(lpcbNeeded) if(lpcbNeeded)
*lpcbNeeded = 0; *lpcbNeeded = 0;
@ -56,7 +56,7 @@ BOOL WINAPI EnumProcesses(DWORD *lpidProcess, DWORD cb, DWORD *lpcbNeeded)
BOOL WINAPI EnumProcessModules( BOOL WINAPI EnumProcessModules(
HANDLE hProcess, HMODULE *lphModule, DWORD cb, LPDWORD lpcbNeeded) HANDLE hProcess, HMODULE *lphModule, DWORD cb, LPDWORD lpcbNeeded)
{ {
FIXME(psapi, "(hProcess=0x%08x, %p, %ld, %p): stub\n", FIXME("(hProcess=0x%08x, %p, %ld, %p): stub\n",
hProcess, lphModule, cb, lpcbNeeded hProcess, lphModule, cb, lpcbNeeded
); );
@ -72,7 +72,7 @@ BOOL WINAPI EnumProcessModules(
DWORD WINAPI GetDeviceDriverBaseNameA( DWORD WINAPI GetDeviceDriverBaseNameA(
LPVOID ImageBase, LPSTR lpBaseName, DWORD nSize) LPVOID ImageBase, LPSTR lpBaseName, DWORD nSize)
{ {
FIXME(psapi, "(%p, %s, %ld): stub\n", FIXME("(%p, %s, %ld): stub\n",
ImageBase, debugstr_a(lpBaseName), nSize ImageBase, debugstr_a(lpBaseName), nSize
); );
@ -88,7 +88,7 @@ DWORD WINAPI GetDeviceDriverBaseNameA(
DWORD WINAPI GetDeviceDriverBaseNameW( DWORD WINAPI GetDeviceDriverBaseNameW(
LPVOID ImageBase, LPWSTR lpBaseName, DWORD nSize) LPVOID ImageBase, LPWSTR lpBaseName, DWORD nSize)
{ {
FIXME(psapi, "(%p, %s, %ld): stub\n", FIXME("(%p, %s, %ld): stub\n",
ImageBase, debugstr_w(lpBaseName), nSize ImageBase, debugstr_w(lpBaseName), nSize
); );
@ -104,7 +104,7 @@ DWORD WINAPI GetDeviceDriverBaseNameW(
DWORD WINAPI GetDeviceDriverFileNameA( DWORD WINAPI GetDeviceDriverFileNameA(
LPVOID ImageBase, LPSTR lpFilename, DWORD nSize) LPVOID ImageBase, LPSTR lpFilename, DWORD nSize)
{ {
FIXME(psapi, "(%p, %s, %ld): stub\n", FIXME("(%p, %s, %ld): stub\n",
ImageBase, debugstr_a(lpFilename), nSize ImageBase, debugstr_a(lpFilename), nSize
); );
@ -120,7 +120,7 @@ DWORD WINAPI GetDeviceDriverFileNameA(
DWORD WINAPI GetDeviceDriverFileNameW( DWORD WINAPI GetDeviceDriverFileNameW(
LPVOID ImageBase, LPWSTR lpFilename, DWORD nSize) LPVOID ImageBase, LPWSTR lpFilename, DWORD nSize)
{ {
FIXME(psapi, "(%p, %s, %ld): stub\n", FIXME("(%p, %s, %ld): stub\n",
ImageBase, debugstr_w(lpFilename), nSize ImageBase, debugstr_w(lpFilename), nSize
); );
@ -136,7 +136,7 @@ DWORD WINAPI GetDeviceDriverFileNameW(
DWORD WINAPI GetMappedFileNameA( DWORD WINAPI GetMappedFileNameA(
HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, DWORD nSize) HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, DWORD nSize)
{ {
FIXME(psapi, "(hProcess=0x%08x, %p, %s, %ld): stub\n", FIXME("(hProcess=0x%08x, %p, %s, %ld): stub\n",
hProcess, lpv, debugstr_a(lpFilename), nSize hProcess, lpv, debugstr_a(lpFilename), nSize
); );
@ -152,7 +152,7 @@ DWORD WINAPI GetMappedFileNameA(
DWORD WINAPI GetMappedFileNameW( DWORD WINAPI GetMappedFileNameW(
HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, DWORD nSize) HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, DWORD nSize)
{ {
FIXME(psapi, "(hProcess=0x%08x, %p, %s, %ld): stub\n", FIXME("(hProcess=0x%08x, %p, %s, %ld): stub\n",
hProcess, lpv, debugstr_w(lpFilename), nSize hProcess, lpv, debugstr_w(lpFilename), nSize
); );
@ -168,7 +168,7 @@ DWORD WINAPI GetMappedFileNameW(
DWORD WINAPI GetModuleBaseNameA( DWORD WINAPI GetModuleBaseNameA(
HANDLE hProcess, HMODULE hModule, LPSTR lpBaseName, DWORD nSize) HANDLE hProcess, HMODULE hModule, LPSTR lpBaseName, DWORD nSize)
{ {
FIXME(psapi, "(hProcess=0x%08x, hModule=0x%08x, %s, %ld): stub\n", FIXME("(hProcess=0x%08x, hModule=0x%08x, %s, %ld): stub\n",
hProcess, hModule, debugstr_a(lpBaseName), nSize hProcess, hModule, debugstr_a(lpBaseName), nSize
); );
@ -184,7 +184,7 @@ DWORD WINAPI GetModuleBaseNameA(
DWORD WINAPI GetModuleBaseNameW( DWORD WINAPI GetModuleBaseNameW(
HANDLE hProcess, HMODULE hModule, LPWSTR lpBaseName, DWORD nSize) HANDLE hProcess, HMODULE hModule, LPWSTR lpBaseName, DWORD nSize)
{ {
FIXME(psapi, "(hProcess=0x%08x, hModule=0x%08x, %s, %ld): stub\n", FIXME("(hProcess=0x%08x, hModule=0x%08x, %s, %ld): stub\n",
hProcess, hModule, debugstr_w(lpBaseName), nSize); hProcess, hModule, debugstr_w(lpBaseName), nSize);
if(lpBaseName && nSize) if(lpBaseName && nSize)
@ -199,7 +199,7 @@ DWORD WINAPI GetModuleBaseNameW(
DWORD WINAPI GetModuleFileNameExA( DWORD WINAPI GetModuleFileNameExA(
HANDLE hProcess, HMODULE hModule, LPSTR lpFilename, DWORD nSize) HANDLE hProcess, HMODULE hModule, LPSTR lpFilename, DWORD nSize)
{ {
FIXME(psapi, "(hProcess=0x%08x,hModule=0x%08x, %s, %ld): stub\n", FIXME("(hProcess=0x%08x,hModule=0x%08x, %s, %ld): stub\n",
hProcess, hModule, debugstr_a(lpFilename), nSize hProcess, hModule, debugstr_a(lpFilename), nSize
); );
@ -215,7 +215,7 @@ DWORD WINAPI GetModuleFileNameExA(
DWORD WINAPI GetModuleFileNameExW( DWORD WINAPI GetModuleFileNameExW(
HANDLE hProcess, HMODULE hModule, LPWSTR lpFilename, DWORD nSize) HANDLE hProcess, HMODULE hModule, LPWSTR lpFilename, DWORD nSize)
{ {
FIXME(psapi, "(hProcess=0x%08x,hModule=0x%08x, %s, %ld): stub\n", FIXME("(hProcess=0x%08x,hModule=0x%08x, %s, %ld): stub\n",
hProcess, hModule, debugstr_w(lpFilename), nSize hProcess, hModule, debugstr_w(lpFilename), nSize
); );
@ -231,7 +231,7 @@ DWORD WINAPI GetModuleFileNameExW(
BOOL WINAPI GetModuleInformation( BOOL WINAPI GetModuleInformation(
HANDLE hProcess, HMODULE hModule, LPMODULEINFO lpmodinfo, DWORD cb) HANDLE hProcess, HMODULE hModule, LPMODULEINFO lpmodinfo, DWORD cb)
{ {
FIXME(psapi, "(hProcess=0x%08x, hModule=0x%08x, %p, %ld): stub\n", FIXME("(hProcess=0x%08x, hModule=0x%08x, %p, %ld): stub\n",
hProcess, hModule, lpmodinfo, cb hProcess, hModule, lpmodinfo, cb
); );
@ -246,7 +246,7 @@ BOOL WINAPI GetModuleInformation(
BOOL WINAPI GetProcessMemoryInfo( BOOL WINAPI GetProcessMemoryInfo(
HANDLE Process, PPROCESS_MEMORY_COUNTERS ppsmemCounters, DWORD cb) HANDLE Process, PPROCESS_MEMORY_COUNTERS ppsmemCounters, DWORD cb)
{ {
FIXME(psapi, "(hProcess=0x%08x, %p, %ld): stub\n", FIXME("(hProcess=0x%08x, %p, %ld): stub\n",
Process, ppsmemCounters, cb Process, ppsmemCounters, cb
); );
@ -261,7 +261,7 @@ BOOL WINAPI GetProcessMemoryInfo(
BOOL WINAPI GetWsChanges( BOOL WINAPI GetWsChanges(
HANDLE hProcess, PPSAPI_WS_WATCH_INFORMATION lpWatchInfo, DWORD cb) HANDLE hProcess, PPSAPI_WS_WATCH_INFORMATION lpWatchInfo, DWORD cb)
{ {
FIXME(psapi, "(hProcess=0x%08x, %p, %ld): stub\n", FIXME("(hProcess=0x%08x, %p, %ld): stub\n",
hProcess, lpWatchInfo, cb hProcess, lpWatchInfo, cb
); );
@ -275,7 +275,7 @@ BOOL WINAPI GetWsChanges(
*/ */
BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess) BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess)
{ {
FIXME(psapi, "(hProcess=0x%08x): stub\n", hProcess); FIXME("(hProcess=0x%08x): stub\n", hProcess);
return TRUE; return TRUE;
} }
@ -288,7 +288,7 @@ BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess)
*/ */
BOOL WINAPI QueryWorkingSet(HANDLE hProcess, LPVOID pv, DWORD cb) BOOL WINAPI QueryWorkingSet(HANDLE hProcess, LPVOID pv, DWORD cb)
{ {
FIXME(psapi, "(hProcess=0x%08x, %p, %ld)", hProcess, pv, cb); FIXME("(hProcess=0x%08x, %p, %ld)", hProcess, pv, cb);
if(pv && cb) if(pv && cb)
((DWORD *) pv)[0] = 0; /* Empty WorkingSet */ ((DWORD *) pv)[0] = 0; /* Empty WorkingSet */

4
dlls/rasapi32/rasapi.c
View file

@ -6,7 +6,7 @@
#include "windef.h" #include "windef.h"
#include "ras.h" #include "ras.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ras) DEFAULT_DEBUG_CHANNEL(ras)
@ -15,6 +15,6 @@ DEFAULT_DEBUG_CHANNEL(ras)
*/ */
DWORD WINAPI RasEnumConnectionsA( LPRASCONNA rca, LPDWORD x, LPDWORD y) { DWORD WINAPI RasEnumConnectionsA( LPRASCONNA rca, LPDWORD x, LPDWORD y) {
/* Remote Access Service stuff is done by underlying OS anyway */ /* Remote Access Service stuff is done by underlying OS anyway */
FIXME(ras,"(%p,%p,%p),stub!\n",rca,x,y); FIXME("(%p,%p,%p),stub!\n",rca,x,y);
return 0; return 0;
} }

6
dlls/tapi32/assisted.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "windef.h" #include "windef.h"
#include "tapi.h" #include "tapi.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(tapi) DEFAULT_DEBUG_CHANNEL(tapi)
@ -15,7 +15,7 @@ DWORD WINAPI tapiGetLocationInfo(LPSTR lpszCountryCode, LPSTR lpszCityCode)
{ {
char temp[30]; char temp[30];
FIXME(tapi, "(%s, %s): file sections ???\n", lpszCountryCode, lpszCityCode); FIXME("(%s, %s): file sections ???\n", lpszCountryCode, lpszCityCode);
if (!(GetPrivateProfileStringA("Locations", "CurrentLocation", "", temp, 30, "telephon.ini"))) if (!(GetPrivateProfileStringA("Locations", "CurrentLocation", "", temp, 30, "telephon.ini")))
return TAPIERR_REQUESTFAILED; return TAPIERR_REQUESTFAILED;
if (!(GetPrivateProfileStringA("Locations", "FIXME_ENTRY", "", lpszCityCode, 8, "telephon.ini"))) if (!(GetPrivateProfileStringA("Locations", "FIXME_ENTRY", "", lpszCityCode, 8, "telephon.ini")))
@ -26,6 +26,6 @@ DWORD WINAPI tapiGetLocationInfo(LPSTR lpszCountryCode, LPSTR lpszCityCode)
DWORD WINAPI tapiRequestMakeCall(LPCSTR lpszDestAddress, LPCSTR lpszAppName, DWORD WINAPI tapiRequestMakeCall(LPCSTR lpszDestAddress, LPCSTR lpszAppName,
LPCSTR lpszCalledParty, LPCSTR lpszComment) LPCSTR lpszCalledParty, LPCSTR lpszComment)
{ {
FIXME(tapi, "(%s, %s, %s, %s): stub.\n", lpszDestAddress, lpszAppName, lpszCalledParty, lpszComment); FIXME("(%s, %s, %s, %s): stub.\n", lpszDestAddress, lpszAppName, lpszCalledParty, lpszComment);
return 0; return 0;
} }

62
dlls/tapi32/phone.c
View file

@ -7,7 +7,7 @@
#include "winbase.h" #include "winbase.h"
#include "windef.h" #include "windef.h"
#include "tapi.h" #include "tapi.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(tapi) DEFAULT_DEBUG_CHANNEL(tapi)
@ -23,115 +23,115 @@ static LPPHONE PHONE_Get(HPHONE hPhone)
DWORD WINAPI phoneClose(HPHONE hPhone) DWORD WINAPI phoneClose(HPHONE hPhone)
{ {
FIXME(tapi, "(%04x), stub.\n", hPhone); FIXME("(%04x), stub.\n", hPhone);
return 0; return 0;
} }
DWORD WINAPI phoneConfigDialog(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass) DWORD WINAPI phoneConfigDialog(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass)
{ {
FIXME(tapi, "(%08lx, %04x, %s): stub.\n", dwDeviceID, hwndOwner, lpszDeviceClass); FIXME("(%08lx, %04x, %s): stub.\n", dwDeviceID, hwndOwner, lpszDeviceClass);
return 0; return 0;
} }
DWORD WINAPI phoneDevSpecific(HPHONE hPhone, LPVOID lpParams, DWORD dwSize) DWORD WINAPI phoneDevSpecific(HPHONE hPhone, LPVOID lpParams, DWORD dwSize)
{ {
FIXME(tapi, "(%04x, %p, %08ld): stub.\n", hPhone, lpParams, dwSize); FIXME("(%04x, %p, %08ld): stub.\n", hPhone, lpParams, dwSize);
return 1; return 1;
} }
DWORD WINAPI phoneGetButtonInfo(HPHONE hPhone, DWORD dwButtonLampID, DWORD WINAPI phoneGetButtonInfo(HPHONE hPhone, DWORD dwButtonLampID,
LPPHONEBUTTONINFO lpButtonInfo) LPPHONEBUTTONINFO lpButtonInfo)
{ {
FIXME(tapi, "(%04x, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo); FIXME("(%04x, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo);
return 0; return 0;
} }
DWORD WINAPI phoneGetData(HPHONE hPhone, DWORD dwDataID, LPVOID lpData, DWORD dwSize) DWORD WINAPI phoneGetData(HPHONE hPhone, DWORD dwDataID, LPVOID lpData, DWORD dwSize)
{ {
FIXME(tapi, "(%04x, %08ld, %p, %08ld): stub.\n", hPhone, dwDataID, lpData, dwSize); FIXME("(%04x, %08ld, %p, %08ld): stub.\n", hPhone, dwDataID, lpData, dwSize);
return 0; return 0;
} }
DWORD WINAPI phoneGetDevCaps(HPHONEAPP hPhoneApp, DWORD dwDeviceID, DWORD WINAPI phoneGetDevCaps(HPHONEAPP hPhoneApp, DWORD dwDeviceID,
DWORD dwAPIVersion, DWORD dwExtVersion, LPPHONECAPS lpPhoneCaps) DWORD dwAPIVersion, DWORD dwExtVersion, LPPHONECAPS lpPhoneCaps)
{ {
FIXME(tapi, "(%04x, %08ld, %08lx, %08lx, %p): stub.\n", hPhoneApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpPhoneCaps); FIXME("(%04x, %08ld, %08lx, %08lx, %p): stub.\n", hPhoneApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpPhoneCaps);
return 0; return 0;
} }
DWORD WINAPI phoneGetDisplay(HPHONE hPhone, LPVARSTRING lpDisplay) DWORD WINAPI phoneGetDisplay(HPHONE hPhone, LPVARSTRING lpDisplay)
{ {
FIXME(tapi, "(%04x, %p): stub.\n", hPhone, lpDisplay); FIXME("(%04x, %p): stub.\n", hPhone, lpDisplay);
return 0; return 0;
} }
DWORD WINAPI phoneGetGain(HPHONE hPhone, DWORD dwHookSwitchDev, LPDWORD lpdwGain) DWORD WINAPI phoneGetGain(HPHONE hPhone, DWORD dwHookSwitchDev, LPDWORD lpdwGain)
{ {
FIXME(tapi, "(%04x, %08lx, %p): stub.\n", hPhone, dwHookSwitchDev, lpdwGain); FIXME("(%04x, %08lx, %p): stub.\n", hPhone, dwHookSwitchDev, lpdwGain);
return 0; return 0;
} }
DWORD WINAPI phoneGetHookSwitch(HPHONE hPhone, LPDWORD lpdwHookSwitchDevs) DWORD WINAPI phoneGetHookSwitch(HPHONE hPhone, LPDWORD lpdwHookSwitchDevs)
{ {
FIXME(tapi, "(%04x, %p): stub.\n", hPhone, lpdwHookSwitchDevs); FIXME("(%04x, %p): stub.\n", hPhone, lpdwHookSwitchDevs);
return 0; return 0;
} }
DWORD WINAPI phoneGetID(HPHONE hPhone, LPVARSTRING lpDeviceID, DWORD WINAPI phoneGetID(HPHONE hPhone, LPVARSTRING lpDeviceID,
LPCSTR lpszDeviceClass) LPCSTR lpszDeviceClass)
{ {
FIXME(tapi, "(%04x, %p, %s): stub.\n", hPhone, lpDeviceID, lpszDeviceClass); return 0; FIXME("(%04x, %p, %s): stub.\n", hPhone, lpDeviceID, lpszDeviceClass); return 0;
} }
DWORD WINAPI phoneGetIcon(DWORD dwDeviceID, LPCSTR lpszDeviceClass, DWORD WINAPI phoneGetIcon(DWORD dwDeviceID, LPCSTR lpszDeviceClass,
HICON *lphIcon) HICON *lphIcon)
{ {
FIXME(tapi, "(%08lx, %s, %p): stub.\n", dwDeviceID, lpszDeviceClass, lphIcon); FIXME("(%08lx, %s, %p): stub.\n", dwDeviceID, lpszDeviceClass, lphIcon);
return 0; return 0;
} }
DWORD WINAPI phoneGetLamp(HPHONE hPhone, DWORD dwButtonLampID, DWORD WINAPI phoneGetLamp(HPHONE hPhone, DWORD dwButtonLampID,
LPDWORD lpdwLampMode) LPDWORD lpdwLampMode)
{ {
FIXME(tapi, "(%04x, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpdwLampMode); FIXME("(%04x, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpdwLampMode);
return 0; return 0;
} }
DWORD WINAPI phoneGetRing(HPHONE hPhone, LPDWORD lpdwRingMode, LPDWORD lpdwVolume) DWORD WINAPI phoneGetRing(HPHONE hPhone, LPDWORD lpdwRingMode, LPDWORD lpdwVolume)
{ {
FIXME(tapi, "(%04x, %p, %p): stub.\n", hPhone, lpdwRingMode, lpdwVolume); FIXME("(%04x, %p, %p): stub.\n", hPhone, lpdwRingMode, lpdwVolume);
return 0; return 0;
} }
DWORD WINAPI phoneGetStatus(HPHONE hPhone, LPPHONESTATUS lpPhoneStatus) DWORD WINAPI phoneGetStatus(HPHONE hPhone, LPPHONESTATUS lpPhoneStatus)
{ {
FIXME(tapi, "(%04x, %p): stub.\n", hPhone, lpPhoneStatus); FIXME("(%04x, %p): stub.\n", hPhone, lpPhoneStatus);
return 0; return 0;
} }
DWORD WINAPI phoneGetStatusMessages(HPHONE hPhone, LPDWORD lpdwPhoneStates, DWORD WINAPI phoneGetStatusMessages(HPHONE hPhone, LPDWORD lpdwPhoneStates,
LPDWORD lpdwButtonModes, LPDWORD lpdwButtonStates) LPDWORD lpdwButtonModes, LPDWORD lpdwButtonStates)
{ {
FIXME(tapi, "(%04x, %p, %p, %p): stub.\n", hPhone, lpdwPhoneStates, lpdwButtonModes, lpdwButtonStates); FIXME("(%04x, %p, %p, %p): stub.\n", hPhone, lpdwPhoneStates, lpdwButtonModes, lpdwButtonStates);
return 0; return 0;
} }
DWORD WINAPI phoneGetVolume(HPHONE hPhone, DWORD dwHookSwitchDevs, DWORD WINAPI phoneGetVolume(HPHONE hPhone, DWORD dwHookSwitchDevs,
LPDWORD lpdwVolume) LPDWORD lpdwVolume)
{ {
FIXME(tapi, "(%04x, %08lx, %p): stub.\n", hPhone, dwHookSwitchDevs, lpdwVolume); FIXME("(%04x, %08lx, %p): stub.\n", hPhone, dwHookSwitchDevs, lpdwVolume);
return 0; return 0;
} }
DWORD WINAPI phoneInitialize(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCSTR lpszAppName, LPDWORD lpdwNumDevs) DWORD WINAPI phoneInitialize(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCSTR lpszAppName, LPDWORD lpdwNumDevs)
{ {
FIXME(tapi, "(%p, %04x, %p, %s, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, lpszAppName, lpdwNumDevs); FIXME("(%p, %04x, %p, %s, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, lpszAppName, lpdwNumDevs);
return 0; return 0;
} }
DWORD WINAPI phoneNegotiateAPIVersion(HPHONEAPP hPhoneApp, DWORD dwDeviceID, DWORD dwAPILowVersion, DWORD dwAPIHighVersion, LPDWORD lpdwAPIVersion, LPPHONEEXTENSIONID lpExtensionID) DWORD WINAPI phoneNegotiateAPIVersion(HPHONEAPP hPhoneApp, DWORD dwDeviceID, DWORD dwAPILowVersion, DWORD dwAPIHighVersion, LPDWORD lpdwAPIVersion, LPPHONEEXTENSIONID lpExtensionID)
{ {
FIXME(tapi, "(): stub.\n"); FIXME("(): stub.\n");
return 0; return 0;
} }
@ -139,72 +139,72 @@ DWORD WINAPI phoneNegotiateExtVersion(HPHONEAPP hPhoneApp, DWORD dwDeviceID,
DWORD dwAPIVersion, DWORD dwExtLowVersion, DWORD dwAPIVersion, DWORD dwExtLowVersion,
DWORD dwExtHighVersion, LPDWORD lpdwExtVersion) DWORD dwExtHighVersion, LPDWORD lpdwExtVersion)
{ {
FIXME(tapi, "(): stub.\n"); FIXME("(): stub.\n");
return 0; return 0;
} }
DWORD WINAPI phoneOpen(HPHONEAPP hPhoneApp, DWORD dwDeviceID, LPHPHONE lphPhone, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges) DWORD WINAPI phoneOpen(HPHONEAPP hPhoneApp, DWORD dwDeviceID, LPHPHONE lphPhone, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges)
{ {
FIXME(tapi, "(): stub.\n"); FIXME("(): stub.\n");
return 0; return 0;
} }
DWORD WINAPI phoneSetButtonInfo(HPHONE hPhone, DWORD dwButtonLampID, LPPHONEBUTTONINFO lpButtonInfo) DWORD WINAPI phoneSetButtonInfo(HPHONE hPhone, DWORD dwButtonLampID, LPPHONEBUTTONINFO lpButtonInfo)
{ {
FIXME(tapi, "(%04x, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo); FIXME("(%04x, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo);
return 0; return 0;
} }
DWORD WINAPI phoneSetData(HPHONE hPhone, DWORD dwDataID, LPVOID lpData, DWORD dwSize) DWORD WINAPI phoneSetData(HPHONE hPhone, DWORD dwDataID, LPVOID lpData, DWORD dwSize)
{ {
FIXME(tapi, "(%04x, %08lx, %p, %ld): stub.\n", hPhone, dwDataID, lpData, dwSize); FIXME("(%04x, %08lx, %p, %ld): stub.\n", hPhone, dwDataID, lpData, dwSize);
return 1; return 1;
} }
DWORD WINAPI phoneSetDisplay(HPHONE hPhone, DWORD dwRow, DWORD dwColumn, LPCSTR lpszDisplay, DWORD dwSize) DWORD WINAPI phoneSetDisplay(HPHONE hPhone, DWORD dwRow, DWORD dwColumn, LPCSTR lpszDisplay, DWORD dwSize)
{ {
FIXME(tapi, "(%04x, '%s' at %ld/%ld, len %ld): stub.\n", hPhone, lpszDisplay, dwRow, dwColumn, dwSize); FIXME("(%04x, '%s' at %ld/%ld, len %ld): stub.\n", hPhone, lpszDisplay, dwRow, dwColumn, dwSize);
return 1; return 1;
} }
DWORD WINAPI phoneSetGain(HPHONE hPhone, DWORD dwHookSwitchDev, DWORD dwGain) DWORD WINAPI phoneSetGain(HPHONE hPhone, DWORD dwHookSwitchDev, DWORD dwGain)
{ {
FIXME(tapi, "(%04x, %08lx, %ld): stub.\n", hPhone, dwHookSwitchDev, dwGain); FIXME("(%04x, %08lx, %ld): stub.\n", hPhone, dwHookSwitchDev, dwGain);
return 1; return 1;
} }
DWORD WINAPI phoneSetHookSwitch(HPHONE hPhone, DWORD dwHookSwitchDevs, DWORD dwHookSwitchMode) DWORD WINAPI phoneSetHookSwitch(HPHONE hPhone, DWORD dwHookSwitchDevs, DWORD dwHookSwitchMode)
{ {
FIXME(tapi, "(%04x, %08lx, %08lx): stub.\n", hPhone, dwHookSwitchDevs, dwHookSwitchMode); FIXME("(%04x, %08lx, %08lx): stub.\n", hPhone, dwHookSwitchDevs, dwHookSwitchMode);
return 1; return 1;
} }
DWORD WINAPI phoneSetLamp(HPHONE hPhone, DWORD dwButtonLampID, DWORD lpdwLampMode) DWORD WINAPI phoneSetLamp(HPHONE hPhone, DWORD dwButtonLampID, DWORD lpdwLampMode)
{ {
FIXME(tapi, "(%04x, %08lx, %08lx): stub.\n", hPhone, dwButtonLampID, lpdwLampMode); FIXME("(%04x, %08lx, %08lx): stub.\n", hPhone, dwButtonLampID, lpdwLampMode);
return 1; return 1;
} }
DWORD WINAPI phoneSetRing(HPHONE hPhone, DWORD dwRingMode, DWORD dwVolume) DWORD WINAPI phoneSetRing(HPHONE hPhone, DWORD dwRingMode, DWORD dwVolume)
{ {
FIXME(tapi, "(%04x, %08lx, %08ld): stub.\n", hPhone, dwRingMode, dwVolume); FIXME("(%04x, %08lx, %08ld): stub.\n", hPhone, dwRingMode, dwVolume);
return 1; return 1;
} }
DWORD WINAPI phoneSetStatusMessages(HPHONE hPhone, DWORD dwPhoneStates, DWORD dwButtonModes, DWORD dwButtonStates) DWORD WINAPI phoneSetStatusMessages(HPHONE hPhone, DWORD dwPhoneStates, DWORD dwButtonModes, DWORD dwButtonStates)
{ {
FIXME(tapi, "(%04x, %08lx, %08lx, %08lx): stub.\n", hPhone, dwPhoneStates, dwButtonModes, dwButtonStates); FIXME("(%04x, %08lx, %08lx, %08lx): stub.\n", hPhone, dwPhoneStates, dwButtonModes, dwButtonStates);
return 0; /* FIXME ? */ return 0; /* FIXME ? */
} }
DWORD WINAPI phoneSetVolume(HPHONE hPhone, DWORD dwHookSwitchDev, DWORD dwVolume) DWORD WINAPI phoneSetVolume(HPHONE hPhone, DWORD dwHookSwitchDev, DWORD dwVolume)
{ {
FIXME(tapi, "(%04x, %08lx, %08ld): stub.\n", hPhone, dwHookSwitchDev, dwVolume); FIXME("(%04x, %08lx, %08ld): stub.\n", hPhone, dwHookSwitchDev, dwVolume);
return 1; return 1;
} }
DWORD WINAPI phoneShutdown(HPHONEAPP hPhoneApp) DWORD WINAPI phoneShutdown(HPHONEAPP hPhoneApp)
{ {
FIXME(tapi, "(%04x): stub.\n", hPhoneApp); FIXME("(%04x): stub.\n", hPhoneApp);
return 0; return 0;
} }

10
dlls/ver/ver16.c
View file

@ -8,7 +8,7 @@
#include "winver.h" #include "winver.h"
#include "ldt.h" #include "ldt.h"
#include "ver.h" #include "ver.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ver) DEFAULT_DEBUG_CHANNEL(ver)
@ -51,7 +51,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName,
*/ */
DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle ) DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle )
{ {
TRACE( ver, "(%s, %p)\n", debugstr_a(lpszFileName), lpdwHandle ); TRACE("(%s, %p)\n", debugstr_a(lpszFileName), lpdwHandle );
return GetFileVersionInfoSizeA( lpszFileName, lpdwHandle ); return GetFileVersionInfoSizeA( lpszFileName, lpdwHandle );
} }
@ -61,7 +61,7 @@ DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle )
DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle, DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle,
DWORD cbBuf, LPVOID lpvData ) DWORD cbBuf, LPVOID lpvData )
{ {
TRACE( ver, "(%s, %08lx, %ld, %p)\n", TRACE("(%s, %08lx, %ld, %p)\n",
debugstr_a(lpszFileName), handle, cbBuf, lpvData ); debugstr_a(lpszFileName), handle, cbBuf, lpvData );
return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData ); return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData );
@ -120,7 +120,7 @@ DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock,
UINT buflen; UINT buflen;
DWORD retv; DWORD retv;
TRACE( ver, "(%p, %s, %p, %p)\n", TRACE("(%p, %s, %p, %p)\n",
lpvBlock, debugstr_a(lpszSubBlock), lpspBuffer, lpcb ); lpvBlock, debugstr_a(lpszSubBlock), lpspBuffer, lpcb );
retv = VerQueryValueA( lpvBlock, lpszSubBlock, &buffer, &buflen ); retv = VerQueryValueA( lpvBlock, lpszSubBlock, &buffer, &buflen );
@ -128,7 +128,7 @@ DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock,
if ( OFFSETOF( spvBlock ) + ((char *) buffer - (char *) lpvBlock) >= 0x10000 ) if ( OFFSETOF( spvBlock ) + ((char *) buffer - (char *) lpvBlock) >= 0x10000 )
{ {
FIXME( ver, "offset %08X too large relative to %04X:%04X\n", FIXME("offset %08X too large relative to %04X:%04X\n",
(char *) buffer - (char *) lpvBlock, SELECTOROF( spvBlock ), OFFSETOF( spvBlock ) ); (char *) buffer - (char *) lpvBlock, SELECTOROF( spvBlock ), OFFSETOF( spvBlock ) );
return FALSE; return FALSE;
} }

48
dlls/version/info.c
View file

@ -15,7 +15,7 @@
#include "winerror.h" #include "winerror.h"
#include "heap.h" #include "heap.h"
#include "ver.h" #include "ver.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ver) DEFAULT_DEBUG_CHANNEL(ver)
@ -32,7 +32,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
{ {
dbg_decl_str(ver, 1024); dbg_decl_str(ver, 1024);
TRACE(ver," structversion=%u.%u, fileversion=%u.%u.%u.%u, productversion=%u.%u.%u.%u, flagmask=0x%lx, flags=%s%s%s%s%s%s\n", TRACE(" structversion=%u.%u, fileversion=%u.%u.%u.%u, productversion=%u.%u.%u.%u, flagmask=0x%lx, flags=%s%s%s%s%s%s\n",
HIWORD(vffi->dwStrucVersion),LOWORD(vffi->dwStrucVersion), HIWORD(vffi->dwStrucVersion),LOWORD(vffi->dwStrucVersion),
HIWORD(vffi->dwFileVersionMS),LOWORD(vffi->dwFileVersionMS), HIWORD(vffi->dwFileVersionMS),LOWORD(vffi->dwFileVersionMS),
HIWORD(vffi->dwFileVersionLS),LOWORD(vffi->dwFileVersionLS), HIWORD(vffi->dwFileVersionLS),LOWORD(vffi->dwFileVersionLS),
@ -68,7 +68,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
case VOS__PM32:dsprintf(ver,"PM32");break; case VOS__PM32:dsprintf(ver,"PM32");break;
default:dsprintf(ver,"UNKNOWN(0x%x)",LOWORD(vffi->dwFileOS));break; default:dsprintf(ver,"UNKNOWN(0x%x)",LOWORD(vffi->dwFileOS));break;
} }
TRACE(ver, "(%s)\n", dbg_str(ver)); TRACE("(%s)\n", dbg_str(ver));
dbg_reset_str(ver); dbg_reset_str(ver);
switch (vffi->dwFileType) { switch (vffi->dwFileType) {
@ -134,9 +134,9 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
case VFT_VXD:dsprintf(ver,"filetype=VXD");break; case VFT_VXD:dsprintf(ver,"filetype=VXD");break;
case VFT_STATIC_LIB:dsprintf(ver,"filetype=STATIC_LIB");break; case VFT_STATIC_LIB:dsprintf(ver,"filetype=STATIC_LIB");break;
} }
TRACE(ver, "%s\n", dbg_str(ver)); TRACE("%s\n", dbg_str(ver));
TRACE(ver, " filedata=0x%lx.0x%lx\n", TRACE(" filedata=0x%lx.0x%lx\n",
vffi->dwFileDateMS,vffi->dwFileDateLS); vffi->dwFileDateMS,vffi->dwFileDateLS);
} }
@ -207,28 +207,28 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
VS_VERSION_INFO_STRUCT32 *child32 = VersionInfo32_Children( info32 ); VS_VERSION_INFO_STRUCT32 *child32 = VersionInfo32_Children( info32 );
VS_VERSION_INFO_STRUCT16 *child16; VS_VERSION_INFO_STRUCT16 *child16;
TRACE( ver, "Converting %p to %p\n", info32, info16 ); TRACE("Converting %p to %p\n", info32, info16 );
TRACE( ver, "wLength %d, wValueLength %d, bText %d, value %p, child %p\n", TRACE("wLength %d, wValueLength %d, bText %d, value %p, child %p\n",
wLength, wValueLength, bText, lpValue, child32 ); wLength, wValueLength, bText, lpValue, child32 );
/* Convert key */ /* Convert key */
lstrcpyWtoA( info16->szKey, info32->szKey ); lstrcpyWtoA( info16->szKey, info32->szKey );
TRACE( ver, "Copied key from %p to %p: %s\n", info32->szKey, info16->szKey, TRACE("Copied key from %p to %p: %s\n", info32->szKey, info16->szKey,
debugstr_a(info16->szKey) ); debugstr_a(info16->szKey) );
/* Convert value */ /* Convert value */
if ( wValueLength == 0 ) if ( wValueLength == 0 )
{ {
info16->wValueLength = 0; info16->wValueLength = 0;
TRACE( ver, "No value present\n" ); TRACE("No value present\n" );
} }
else if ( bText ) else if ( bText )
{ {
info16->wValueLength = lstrlenW( (LPCWSTR)lpValue ) + 1; info16->wValueLength = lstrlenW( (LPCWSTR)lpValue ) + 1;
lstrcpyWtoA( VersionInfo16_Value( info16 ), (LPCWSTR)lpValue ); lstrcpyWtoA( VersionInfo16_Value( info16 ), (LPCWSTR)lpValue );
TRACE( ver, "Copied value from %p to %p: %s\n", lpValue, TRACE("Copied value from %p to %p: %s\n", lpValue,
VersionInfo16_Value( info16 ), VersionInfo16_Value( info16 ),
debugstr_a(VersionInfo16_Value( info16 )) ); debugstr_a(VersionInfo16_Value( info16 )) );
} }
@ -237,7 +237,7 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
info16->wValueLength = wValueLength; info16->wValueLength = wValueLength;
memmove( VersionInfo16_Value( info16 ), lpValue, wValueLength ); memmove( VersionInfo16_Value( info16 ), lpValue, wValueLength );
TRACE( ver, "Copied value from %p to %p: %d bytes\n", lpValue, TRACE("Copied value from %p to %p: %d bytes\n", lpValue,
VersionInfo16_Value( info16 ), wValueLength ); VersionInfo16_Value( info16 ), wValueLength );
} }
@ -256,7 +256,7 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
/* Fixup length */ /* Fixup length */
info16->wLength = (DWORD)child16 - (DWORD)info16; info16->wLength = (DWORD)child16 - (DWORD)info16;
TRACE( ver, "Finished, length is %d (%p - %p)\n", TRACE("Finished, length is %d (%p - %p)\n",
info16->wLength, info16, child16 ); info16->wLength, info16, child16 );
} }
@ -270,7 +270,7 @@ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
DWORD len, ret, offset; DWORD len, ret, offset;
BYTE buf[144]; BYTE buf[144];
TRACE( ver, "(%s,%p)\n", debugstr_a(filename), handle ); TRACE("(%s,%p)\n", debugstr_a(filename), handle );
len = GetFileResourceSize( filename, len = GetFileResourceSize( filename,
MAKEINTRESOURCEA(VS_FILE_INFO), MAKEINTRESOURCEA(VS_FILE_INFO),
@ -293,7 +293,7 @@ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
if ( vffi->dwSignature != VS_FFI_SIGNATURE ) if ( vffi->dwSignature != VS_FFI_SIGNATURE )
{ {
WARN( ver, "vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n", WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n",
vffi->dwSignature, VS_FFI_SIGNATURE ); vffi->dwSignature, VS_FFI_SIGNATURE );
return 0; return 0;
} }
@ -301,7 +301,7 @@ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
if ( ((VS_VERSION_INFO_STRUCT16 *)buf)->wLength < len ) if ( ((VS_VERSION_INFO_STRUCT16 *)buf)->wLength < len )
len = ((VS_VERSION_INFO_STRUCT16 *)buf)->wLength; len = ((VS_VERSION_INFO_STRUCT16 *)buf)->wLength;
if ( TRACE_ON( ver ) ) if ( TRACE_ON(ver) )
print_vffi_debug( vffi ); print_vffi_debug( vffi );
return len; return len;
@ -324,7 +324,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
DWORD WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle,
DWORD datasize, LPVOID data ) DWORD datasize, LPVOID data )
{ {
TRACE( ver, "(%s,%ld,size=%ld,data=%p)\n", TRACE("(%s,%ld,size=%ld,data=%p)\n",
debugstr_a(filename), handle, datasize, data ); debugstr_a(filename), handle, datasize, data );
if ( !GetFileResource( filename, MAKEINTRESOURCEA(VS_FILE_INFO), if ( !GetFileResource( filename, MAKEINTRESOURCEA(VS_FILE_INFO),
@ -353,7 +353,7 @@ DWORD WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle,
LPSTR fn = HEAP_strdupWtoA( GetProcessHeap(), 0, filename ); LPSTR fn = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
DWORD retv = TRUE; DWORD retv = TRUE;
TRACE( ver, "(%s,%ld,size=%ld,data=%p)\n", TRACE("(%s,%ld,size=%ld,data=%p)\n",
debugstr_a(fn), handle, datasize, data ); debugstr_a(fn), handle, datasize, data );
if ( !GetFileResource( fn, MAKEINTRESOURCEA(VS_FILE_INFO), if ( !GetFileResource( fn, MAKEINTRESOURCEA(VS_FILE_INFO),
@ -365,7 +365,7 @@ DWORD WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle,
&& datasize >= ((VS_VERSION_INFO_STRUCT16 *)data)->wLength && datasize >= ((VS_VERSION_INFO_STRUCT16 *)data)->wLength
&& VersionInfoIs16( data ) ) && VersionInfoIs16( data ) )
{ {
ERR( ver, "Cannot access NE resource in %s\n", debugstr_a(fn) ); ERR("Cannot access NE resource in %s\n", debugstr_a(fn) );
retv = FALSE; retv = FALSE;
} }
@ -422,11 +422,11 @@ DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock; VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock;
if ( !VersionInfoIs16( info ) ) if ( !VersionInfoIs16( info ) )
{ {
ERR( ver, "called on PE resource!\n" ); ERR("called on PE resource!\n" );
return FALSE; return FALSE;
} }
TRACE( ver, "(%p,%s,%p,%p)\n", TRACE("(%p,%s,%p,%p)\n",
pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen ); pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen );
while ( *lpSubBlock ) while ( *lpSubBlock )
@ -468,11 +468,11 @@ DWORD WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock,
VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock; VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock;
if ( VersionInfoIs16( info ) ) if ( VersionInfoIs16( info ) )
{ {
ERR( ver, "called on NE resource!\n" ); ERR("called on NE resource!\n" );
return FALSE; return FALSE;
} }
TRACE( ver, "(%p,%s,%p,%p)\n", TRACE("(%p,%s,%p,%p)\n",
pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen ); pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen );
while ( *lpSubBlock ) while ( *lpSubBlock )
@ -516,7 +516,7 @@ DWORD WINAPI VerLanguageNameA( UINT wLang, LPSTR szLang, UINT nSize )
LPCSTR name; LPCSTR name;
DWORD result; DWORD result;
TRACE( ver, "(%d,%p,%d)\n", wLang, szLang, nSize ); TRACE("(%d,%p,%d)\n", wLang, szLang, nSize );
/* /*
* First, check \System\CurrentControlSet\control\Nls\Locale\<langid> * First, check \System\CurrentControlSet\control\Nls\Locale\<langid>
@ -551,7 +551,7 @@ DWORD WINAPI VerLanguageNameW( UINT wLang, LPWSTR szLang, UINT nSize )
LPCSTR name; LPCSTR name;
DWORD result; DWORD result;
TRACE( ver, "(%d,%p,%d)\n", wLang, szLang, nSize ); TRACE("(%d,%p,%d)\n", wLang, szLang, nSize );
/* /*
* First, check \System\CurrentControlSet\control\Nls\Locale\<langid> * First, check \System\CurrentControlSet\control\Nls\Locale\<langid>

32
dlls/version/install.c
View file

@ -16,7 +16,7 @@
#include "ver.h" #include "ver.h"
#include "lzexpand.h" #include "lzexpand.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ver) DEFAULT_DEBUG_CHANNEL(ver)
@ -50,7 +50,7 @@ static void ver_dstring(
char const * teststring, char const * teststring,
char const * epilogue ) char const * epilogue )
{ {
TRACE(ver, "%s %p (\"%s\") %s\n", prologue, TRACE("%s %p (\"%s\") %s\n", prologue,
(void const *) teststring, (void const *) teststring,
teststring ? teststring : "(null)", teststring ? teststring : "(null)",
epilogue); epilogue);
@ -189,27 +189,27 @@ DWORD WINAPI VerFindFileA(
retval = 0; retval = 0;
/* Print out debugging information */ /* Print out debugging information */
TRACE(ver, "called with parameters:\n" TRACE("called with parameters:\n"
"\tflags = %x", flags); "\tflags = %x", flags);
if(flags & VFFF_ISSHAREDFILE) if(flags & VFFF_ISSHAREDFILE)
TRACE(ver, " (VFFF_ISSHAREDFILE)\n"); TRACE(" (VFFF_ISSHAREDFILE)\n");
else else
TRACE(ver, "\n"); TRACE("\n");
ver_dstring("\tlpszFilename = ", lpszFilename, ""); ver_dstring("\tlpszFilename = ", lpszFilename, "");
ver_dstring("\tlpszWinDir = ", lpszWinDir, ""); ver_dstring("\tlpszWinDir = ", lpszWinDir, "");
ver_dstring("\tlpszAppDir = ", lpszAppDir, ""); ver_dstring("\tlpszAppDir = ", lpszAppDir, "");
TRACE(ver, "\tlpszCurDir = %p\n", lpszCurDir); TRACE("\tlpszCurDir = %p\n", lpszCurDir);
if(lpuCurDirLen) if(lpuCurDirLen)
TRACE(ver, "\tlpuCurDirLen = %p (%u)\n", TRACE("\tlpuCurDirLen = %p (%u)\n",
lpuCurDirLen, *lpuCurDirLen); lpuCurDirLen, *lpuCurDirLen);
else else
TRACE(ver, "\tlpuCurDirLen = (null)\n"); TRACE("\tlpuCurDirLen = (null)\n");
TRACE(ver, "\tlpszDestDir = %p\n", lpszDestDir); TRACE("\tlpszDestDir = %p\n", lpszDestDir);
if(lpuDestDirLen) if(lpuDestDirLen)
TRACE(ver, "\tlpuDestDirLen = %p (%u)\n", TRACE("\tlpuDestDirLen = %p (%u)\n",
lpuDestDirLen, *lpuDestDirLen); lpuDestDirLen, *lpuDestDirLen);
/* Figure out where the file should go; shared files default to the /* Figure out where the file should go; shared files default to the
@ -301,21 +301,21 @@ DWORD WINAPI VerFindFileA(
*lpuCurDirLen = curDirSizeReq; *lpuCurDirLen = curDirSizeReq;
} }
TRACE(ver, "ret = %lu (%s%s%s)\n", retval, TRACE("ret = %lu (%s%s%s)\n", retval,
(retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "", (retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "",
(retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "", (retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "",
(retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : ""); (retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : "");
ver_dstring("\t(Exit) lpszCurDir = ", lpszCurDir, ""); ver_dstring("\t(Exit) lpszCurDir = ", lpszCurDir, "");
if(lpuCurDirLen) if(lpuCurDirLen)
TRACE(ver, "\t(Exit) lpuCurDirLen = %p (%u)\n", TRACE("\t(Exit) lpuCurDirLen = %p (%u)\n",
lpuCurDirLen, *lpuCurDirLen); lpuCurDirLen, *lpuCurDirLen);
else else
TRACE(ver, "\t(Exit) lpuCurDirLen = (null)\n"); TRACE("\t(Exit) lpuCurDirLen = (null)\n");
ver_dstring("\t(Exit) lpszDestDir = ", lpszDestDir, ""); ver_dstring("\t(Exit) lpszDestDir = ", lpszDestDir, "");
if(lpuDestDirLen) if(lpuDestDirLen)
TRACE(ver, "\t(Exit) lpuDestDirLen = %p (%u)\n", TRACE("\t(Exit) lpuDestDirLen = %p (%u)\n",
lpuDestDirLen, *lpuDestDirLen); lpuDestDirLen, *lpuDestDirLen);
return retval; return retval;
@ -371,7 +371,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) {
if ((*vffi)->dwSignature == 0x004f0049) /* hack to detect unicode */ if ((*vffi)->dwSignature == 0x004f0049) /* hack to detect unicode */
*vffi = (VS_FIXEDFILEINFO*)(buf+0x28); *vffi = (VS_FIXEDFILEINFO*)(buf+0x28);
if ((*vffi)->dwSignature != VS_FFI_SIGNATURE) if ((*vffi)->dwSignature != VS_FFI_SIGNATURE)
WARN(ver,"Bad VS_FIXEDFILEINFO signature 0x%08lx\n",(*vffi)->dwSignature); WARN("Bad VS_FIXEDFILEINFO signature 0x%08lx\n",(*vffi)->dwSignature);
return buf; return buf;
} }
} }
@ -404,7 +404,7 @@ DWORD WINAPI VerInstallFileA(
LPBYTE buf1,buf2; LPBYTE buf1,buf2;
OFSTRUCT ofs; OFSTRUCT ofs;
TRACE(ver,"(%x,%s,%s,%s,%s,%s,%p,%d)\n", TRACE("(%x,%s,%s,%s,%s,%s,%p,%d)\n",
flags,srcfilename,destfilename,srcdir,destdir,curdir,tmpfile,*tmpfilelen flags,srcfilename,destfilename,srcdir,destdir,curdir,tmpfile,*tmpfilelen
); );
xret = 0; xret = 0;

26
dlls/version/resource.c
View file

@ -17,7 +17,7 @@
#include "heap.h" #include "heap.h"
#include "lzexpand.h" #include "lzexpand.h"
#include "peexe.h" #include "peexe.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ver) DEFAULT_DEBUG_CHANNEL(ver)
@ -48,7 +48,7 @@ static int read_xx_header( HFILE lzfd )
return IMAGE_NT_SIGNATURE; return IMAGE_NT_SIGNATURE;
magic[2] = '\0'; magic[2] = '\0';
WARN( ver, "Can't handle %s files.\n", magic ); WARN("Can't handle %s files.\n", magic );
return 0; return 0;
} }
@ -72,7 +72,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
resTabSize = nehd.rname_tab_offset - nehd.resource_tab_offset; resTabSize = nehd.rname_tab_offset - nehd.resource_tab_offset;
if ( !resTabSize ) if ( !resTabSize )
{ {
TRACE( ver, "No resources in NE dll\n" ); TRACE("No resources in NE dll\n" );
return FALSE; return FALSE;
} }
@ -92,14 +92,14 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
typeInfo = NE_FindTypeSection( resTab, typeInfo, typeid ); typeInfo = NE_FindTypeSection( resTab, typeInfo, typeid );
if ( !typeInfo ) if ( !typeInfo )
{ {
TRACE( ver, "No typeid entry found for %p\n", typeid ); TRACE("No typeid entry found for %p\n", typeid );
HeapFree( GetProcessHeap(), 0, resTab ); HeapFree( GetProcessHeap(), 0, resTab );
return FALSE; return FALSE;
} }
nameInfo = NE_FindResourceFromType( resTab, typeInfo, resid ); nameInfo = NE_FindResourceFromType( resTab, typeInfo, resid );
if ( !nameInfo ) if ( !nameInfo )
{ {
TRACE( ver, "No resid entry found for %p\n", typeid ); TRACE("No resid entry found for %p\n", typeid );
HeapFree( GetProcessHeap(), 0, resTab ); HeapFree( GetProcessHeap(), 0, resTab );
return FALSE; return FALSE;
} }
@ -137,7 +137,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_FILE_RESOURCE_DIRECTORY; resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_FILE_RESOURCE_DIRECTORY;
if ( !resDataDir->Size ) if ( !resDataDir->Size )
{ {
TRACE( ver, "No resources in PE dll\n" ); TRACE("No resources in PE dll\n" );
return FALSE; return FALSE;
} }
@ -169,7 +169,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
if ( i == nSections ) if ( i == nSections )
{ {
HeapFree( GetProcessHeap(), 0, sections ); HeapFree( GetProcessHeap(), 0, sections );
TRACE( ver, "Couldn't find resource section\n" ); TRACE("Couldn't find resource section\n" );
return FALSE; return FALSE;
} }
@ -198,7 +198,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
resPtr = GetResDirEntryA( resPtr, typeid, resDir, FALSE ); resPtr = GetResDirEntryA( resPtr, typeid, resDir, FALSE );
if ( !resPtr ) if ( !resPtr )
{ {
TRACE( ver, "No typeid entry found for %p\n", typeid ); TRACE("No typeid entry found for %p\n", typeid );
HeapFree( GetProcessHeap(), 0, resSection ); HeapFree( GetProcessHeap(), 0, resSection );
HeapFree( GetProcessHeap(), 0, sections ); HeapFree( GetProcessHeap(), 0, sections );
return FALSE; return FALSE;
@ -206,7 +206,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
resPtr = GetResDirEntryA( resPtr, resid, resDir, FALSE ); resPtr = GetResDirEntryA( resPtr, resid, resDir, FALSE );
if ( !resPtr ) if ( !resPtr )
{ {
TRACE( ver, "No resid entry found for %p\n", resid ); TRACE("No resid entry found for %p\n", resid );
HeapFree( GetProcessHeap(), 0, resSection ); HeapFree( GetProcessHeap(), 0, resSection );
HeapFree( GetProcessHeap(), 0, sections ); HeapFree( GetProcessHeap(), 0, sections );
return FALSE; return FALSE;
@ -214,7 +214,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
resPtr = GetResDirEntryA( resPtr, 0, resDir, TRUE ); resPtr = GetResDirEntryA( resPtr, 0, resDir, TRUE );
if ( !resPtr ) if ( !resPtr )
{ {
TRACE( ver, "No default language entry found for %p\n", resid ); TRACE("No default language entry found for %p\n", resid );
HeapFree( GetProcessHeap(), 0, resSection ); HeapFree( GetProcessHeap(), 0, resSection );
HeapFree( GetProcessHeap(), 0, sections ); HeapFree( GetProcessHeap(), 0, sections );
return FALSE; return FALSE;
@ -230,7 +230,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
if ( i == nSections ) if ( i == nSections )
{ {
TRACE( ver, "Couldn't find resource data section\n" ); TRACE("Couldn't find resource data section\n" );
HeapFree( GetProcessHeap(), 0, resSection ); HeapFree( GetProcessHeap(), 0, resSection );
HeapFree( GetProcessHeap(), 0, sections ); HeapFree( GetProcessHeap(), 0, sections );
return FALSE; return FALSE;
@ -258,7 +258,7 @@ DWORD WINAPI GetFileResourceSize( LPCSTR lpszFileName,
OFSTRUCT ofs; OFSTRUCT ofs;
DWORD reslen; DWORD reslen;
TRACE( ver, "(%s,type=0x%lx,id=0x%lx,off=%p)\n", TRACE("(%s,type=0x%lx,id=0x%lx,off=%p)\n",
debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId, debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId,
lpszResId ); lpszResId );
@ -295,7 +295,7 @@ DWORD WINAPI GetFileResource( LPCSTR lpszFileName,
OFSTRUCT ofs; OFSTRUCT ofs;
DWORD reslen = dwResLen; DWORD reslen = dwResLen;
TRACE( ver, "(%s,type=0x%lx,id=0x%lx,off=%ld,len=%ld,data=%p)\n", TRACE("(%s,type=0x%lx,id=0x%lx,off=%ld,len=%ld,data=%p)\n",
debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId, debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId,
dwFileOffset, dwResLen, lpvData ); dwFileOffset, dwResLen, lpvData );

14
ipc/dde_atom.c
View file

@ -15,7 +15,7 @@
#include "shm_main_blk.h" #include "shm_main_blk.h"
#include "shm_fragment.h" #include "shm_fragment.h"
#include "ldt.h" #include "ldt.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(atom) DEFAULT_DEBUG_CHANNEL(atom)
@ -130,7 +130,7 @@ ATOM DDE_GlobalAddAtom( SEGPTR name )
return (atom<MIN_STR_ATOM) ? atom : 0; return (atom<MIN_STR_ATOM) ? atom : 0;
} }
TRACE(atom,"(\"%s\")\n",str); TRACE("(\"%s\")\n",str);
DDE_IPC_init(); /* will initialize only if needed */ DDE_IPC_init(); /* will initialize only if needed */
@ -175,7 +175,7 @@ ATOM DDE_GlobalDeleteAtom( ATOM atom )
AtomData_ptr atom_ptr; AtomData_ptr atom_ptr;
ATOM retval=(ATOM) 0; ATOM retval=(ATOM) 0;
TRACE(atom,"(\"%d\")\n",(int)atom); TRACE("(\"%d\")\n",(int)atom);
atom_idx=(int)atom - MIN_STR_ATOM; atom_idx=(int)atom - MIN_STR_ATOM;
if (atom_idx < 0 ) if (atom_idx < 0 )
@ -188,7 +188,7 @@ ATOM DDE_GlobalDeleteAtom( ATOM atom )
switch (atom_ofs=ATOM_OFS(atom_idx)) { switch (atom_ofs=ATOM_OFS(atom_idx)) {
case DELETED: case DELETED:
case EMPTY: case EMPTY:
WARN(atom, "Trying to free unallocated atom %d\n", atom); WARN("Trying to free unallocated atom %d\n", atom);
retval=atom; retval=atom;
break; break;
default : default :
@ -212,7 +212,7 @@ ATOM DDE_GlobalFindAtom( SEGPTR name )
int atom_ofs; int atom_ofs;
char *str; char *str;
TRACE(atom,"(%08lx)\n", name ); TRACE("(%08lx)\n", name );
/* First check for integer atom */ /* First check for integer atom */
@ -224,7 +224,7 @@ ATOM DDE_GlobalFindAtom( SEGPTR name )
ATOM atom= (ATOM) atoi(&str[1]); ATOM atom= (ATOM) atoi(&str[1]);
return (atom<MIN_STR_ATOM) ? atom : 0; return (atom<MIN_STR_ATOM) ? atom : 0;
} }
TRACE(atom,"(\"%s\")\n",str); TRACE("(\"%s\")\n",str);
DDE_IPC_init(); /* will initialize only if needed */ DDE_IPC_init(); /* will initialize only if needed */
@ -274,7 +274,7 @@ WORD DDE_GlobalGetAtomName( ATOM atom, LPSTR buffer, short count )
shm_read_wait(main_block->sem); shm_read_wait(main_block->sem);
atom_ofs=ATOM_OFS(atom_idx); atom_ofs=ATOM_OFS(atom_idx);
if (atom_ofs==EMPTY || atom_ofs==DELETED) { if (atom_ofs==EMPTY || atom_ofs==DELETED) {
WARN(atom,"Illegal atom=%d\n",(int)atom); WARN("Illegal atom=%d\n",(int)atom);
size=0; size=0;
} else { /* non empty entry */ } else { /* non empty entry */
/* string length will be at most count-1, find actual size */ /* string length will be at most count-1, find actual size */

2
ipc/dde_atom_test.c
View file

@ -12,7 +12,7 @@
#include <win.h> #include <win.h>
#include "dde_atom.h" #include "dde_atom.h"
#include "shm_main_blk.h" #include "shm_main_blk.h"
#include <debug.h> #include "debugtools.h"
DECLARE_DEBUG_CHANNEL(atom) DECLARE_DEBUG_CHANNEL(atom)
DECLARE_DEBUG_CHANNEL(sem) DECLARE_DEBUG_CHANNEL(sem)

7
ipc/shm_block.c
View file

@ -9,13 +9,12 @@
*/ */
#ifdef CONFIG_IPC #ifdef CONFIG_IPC
#define inline inline
#include <sys/types.h> #include <sys/types.h>
#include <sys/sem.h> #include <sys/sem.h>
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include "debug.h" #include "debugtools.h"
#include "global.h" #include "global.h"
#include "selectors.h" #include "selectors.h"
#include "shm_fragment.h" #include "shm_fragment.h"
@ -38,7 +37,7 @@ struct local_shm_map *shm_map=NULL;
*/ */
void shm_setup_block(struct shm_block *block, int first, int size) void shm_setup_block(struct shm_block *block, int first, int size)
{ {
TRACE(shm,"Setting up shm block at 0x%08x\n",(int )block); TRACE("Setting up shm block at 0x%08x\n",(int )block);
/* setup block internal data structure */ /* setup block internal data structure */
if (first <= 0) { if (first <= 0) {
first=sizeof(*block); first=sizeof(*block);
@ -54,7 +53,7 @@ void shm_setup_block(struct shm_block *block, int first, int size)
/* block->size is initialized in shm_FragmentInit */ /* block->size is initialized in shm_FragmentInit */
shm_FragmentInit(block, first, size); /* first item in the free list */ shm_FragmentInit(block, first, size); /* first item in the free list */
TRACE(shm, "block was set up at 0x%08x, size=0x%04xKB, 1st usable=%02x\n", TRACE("block was set up at 0x%08x, size=0x%04xKB, 1st usable=%02x\n",
(int )block,size/1024,first); (int )block,size/1024,first);
} }

2
ipc/shm_fragment.c
View file

@ -10,7 +10,7 @@
#ifdef CONFIG_IPC #ifdef CONFIG_IPC
#include <stdio.h> /* for debugging only */ #include <stdio.h> /* for debugging only */
#include <debug.h> /* for "stddeb" */ #include "debugtools.h" /* for "stddeb" */
#include "shm_fragment.h" #include "shm_fragment.h"
#include "shm_block.h" #include "shm_block.h"

2
ipc/shm_fragment_test.c
View file

@ -10,7 +10,7 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#define DEBUG_DEFINE_VARIABLES /* just avoid dumb errors */ #define DEBUG_DEFINE_VARIABLES /* just avoid dumb errors */
#include <debug.h> /* for "stddeb" */ #include "debugtools.h" /* for "stddeb" */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "shm_block.h" #include "shm_block.h"

29
ipc/shm_main_blk.c
View file

@ -9,7 +9,6 @@
*/ */
#ifdef CONFIG_IPC #ifdef CONFIG_IPC
#define inline inline
#include <sys/types.h> #include <sys/types.h>
#include <sys/sem.h> #include <sys/sem.h>
#include <time.h> #include <time.h>
@ -17,7 +16,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include "debug.h" #include "debugtools.h"
#include "shm_fragment.h" #include "shm_fragment.h"
#include "shm_block.h" #include "shm_block.h"
#include "shm_main_blk.h" #include "shm_main_blk.h"
@ -80,7 +79,7 @@ int proc_exist(pid_t pid)
/* setup a new main shm block (only construct a shm block object). */ /* setup a new main shm block (only construct a shm block object). */
static void shm_setup_main_block() static void shm_setup_main_block()
{ {
TRACE(shm,"creating data structure\n"); TRACE("creating data structure\n");
main_block->build_lock=1; main_block->build_lock=1;
strcpy(main_block->magic, shm_header); strcpy(main_block->magic, shm_header);
@ -134,19 +133,19 @@ static int attach_MainBlock(int shm_id)
/* Make sure we don't work on somebody else's block */ /* Make sure we don't work on somebody else's block */
if (shm_info.shm_perm.cuid != getuid()) { /* creator is not me */ if (shm_info.shm_perm.cuid != getuid()) { /* creator is not me */
WARN(shm, "Creator is not me!\n"); WARN("Creator is not me!\n");
return 0; return 0;
} }
TRACE(shm,"shared memory exist, attaching anywhere\n"); TRACE("shared memory exist, attaching anywhere\n");
main_block=(struct shm_main_block *)shmat(shm_id, 0, 0); main_block=(struct shm_main_block *)shmat(shm_id, 0, 0);
if ( (int)main_block==-1) { if ( (int)main_block==-1) {
WARN(shm, "Attach failed\n"); WARN("Attach failed\n");
return 0; return 0;
} }
if (strcmp(main_block->magic, shm_header) != 0) { if (strcmp(main_block->magic, shm_header) != 0) {
TRACE(shm,"Detaching, wrong magic\n"); TRACE("Detaching, wrong magic\n");
shmdt((void *)main_block); shmdt((void *)main_block);
return 0; return 0;
} }
@ -156,7 +155,7 @@ static int attach_MainBlock(int shm_id)
/* Is it an old unused block ? */ /* Is it an old unused block ? */
if (shm_info.shm_nattch == 0) { if (shm_info.shm_nattch == 0) {
TRACE(shm,"No attaches, deleting old data\n"); TRACE("No attaches, deleting old data\n");
shm_delete_all(shm_id); shm_delete_all(shm_id);
return 0; return 0;
} }
@ -181,10 +180,10 @@ static int shm_locate_MainBlock(key_t shm_key)
int shm_id; /* Descriptor to this shared memory */ int shm_id; /* Descriptor to this shared memory */
int i; int i;
TRACE(shm,"trying to attach, key=0x%x\n", TRACE("trying to attach, key=0x%x\n",
shm_key); shm_key);
for (i=0 ; i < SHM_KEY_RANGE ; i++) { for (i=0 ; i < SHM_KEY_RANGE ; i++) {
TRACE(shm,"iteration=%d\n", i); TRACE("iteration=%d\n", i);
shm_id= shmget ( shm_key+i, SHM_MINBLOCK ,0700); shm_id= shmget ( shm_key+i, SHM_MINBLOCK ,0700);
@ -203,7 +202,7 @@ static int shm_locate_MainBlock(key_t shm_key)
case ENOMEM: /* no free memory */ case ENOMEM: /* no free memory */
case ENOENT: /* this key does not exist */ case ENOENT: /* this key does not exist */
default : default :
WARN(shm,"shmget failed, errno=%d, %s\n", WARN("shmget failed, errno=%d, %s\n",
errno, strerror(errno) ); errno, strerror(errno) );
return 0; /* Failed */ return 0; /* Failed */
} }
@ -223,7 +222,7 @@ static int shm_create_MainBlock(key_t MainShmKey)
int flags= 0700 | IPC_CREAT | IPC_EXCL; int flags= 0700 | IPC_CREAT | IPC_EXCL;
int i; int i;
TRACE(shm,"creating shared memory\n"); TRACE("creating shared memory\n");
/* try to allocate shared memory with key="Wine", size=SHM_MINBLOCK, */ /* try to allocate shared memory with key="Wine", size=SHM_MINBLOCK, */
/* complete user permission */ /* complete user permission */
@ -233,10 +232,10 @@ static int shm_create_MainBlock(key_t MainShmKey)
break; break;
} }
if (shm_id == -1) { if (shm_id == -1) {
WARN(shm, "failed to create shared memory\n"); WARN("failed to create shared memory\n");
return 0; return 0;
} }
TRACE(shm,"shared memory created, attaching\n"); TRACE("shared memory created, attaching\n");
main_block=(struct shm_main_block*) shmat(shm_id, 0,0); main_block=(struct shm_main_block*) shmat(shm_id, 0,0);
if (TRACE_ON(shm)) if (TRACE_ON(shm))
print_shm_info(shm_id); print_shm_info(shm_id);
@ -253,7 +252,7 @@ int shm_init(void)
{ {
if ( !shm_locate_MainBlock(WineKey) if ( !shm_locate_MainBlock(WineKey)
&& !shm_create_MainBlock(WineKey)) { && !shm_create_MainBlock(WineKey)) {
ERR(shm, "Failed to init main shm block\n"); ERR("Failed to init main shm block\n");
exit(1); exit(1);
} }

19
ipc/shm_semaph.c
View file

@ -9,12 +9,11 @@
*/ */
#ifdef CONFIG_IPC #ifdef CONFIG_IPC
#define inline inline
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>
#include <sys/sem.h> #include <sys/sem.h>
#include <errno.h> #include <errno.h>
#include "debug.h" #include "debugtools.h"
#include "shm_semaph.h" #include "shm_semaph.h"
DEFAULT_DEBUG_CHANNEL(sem) DEFAULT_DEBUG_CHANNEL(sem)
@ -29,7 +28,7 @@ void shm_read_wait(shm_sem semid)
struct sembuf sop[2]; struct sembuf sop[2];
int ret; int ret;
TRACE(sem,"(%d)\n",semid); TRACE("(%d)\n",semid);
sop[0].sem_num=SEM_READ; sop[0].sem_num=SEM_READ;
sop[0].sem_op=1; /* add this read instance */ sop[0].sem_op=1; /* add this read instance */
sop[0].sem_flg=SEM_UNDO; /* undo in case process dies */ sop[0].sem_flg=SEM_UNDO; /* undo in case process dies */
@ -43,7 +42,7 @@ void shm_read_wait(shm_sem semid)
} while (ret<0 && errno==EINTR); /* interrupted system call? */ } while (ret<0 && errno==EINTR); /* interrupted system call? */
if (ret<0) if (ret<0)
WARN(sem,"(semid=%d,errno=%d): Failed semaphore lock for read\n", WARN("(semid=%d,errno=%d): Failed semaphore lock for read\n",
semid, errno); semid, errno);
} }
void shm_write_wait(shm_sem semid) void shm_write_wait(shm_sem semid)
@ -51,7 +50,7 @@ void shm_write_wait(shm_sem semid)
struct sembuf sop[3]; struct sembuf sop[3];
int ret; int ret;
TRACE(sem,"(%d)\n",semid); TRACE("(%d)\n",semid);
sop[0].sem_num=SEM_READ; sop[0].sem_num=SEM_READ;
sop[0].sem_op=0; /* wait until no reading instance exist */ sop[0].sem_op=0; /* wait until no reading instance exist */
sop[0].sem_flg=SEM_UNDO; sop[0].sem_flg=SEM_UNDO;
@ -69,7 +68,7 @@ void shm_write_wait(shm_sem semid)
} while (ret<0 && errno==EINTR); /* interrupted system call? */ } while (ret<0 && errno==EINTR); /* interrupted system call? */
if (ret<0) /* test for the error */ if (ret<0) /* test for the error */
WARN(sem,"(semid=%d,errno=%d): Failed semaphore lock for write\n", WARN("(semid=%d,errno=%d): Failed semaphore lock for write\n",
semid, errno); semid, errno);
} }
void shm_write_signal(shm_sem semid) void shm_write_signal(shm_sem semid)
@ -77,7 +76,7 @@ void shm_write_signal(shm_sem semid)
struct sembuf sop[2]; struct sembuf sop[2];
int ret; int ret;
TRACE(sem,"(%d)\n",semid); TRACE("(%d)\n",semid);
sop[0].sem_num=SEM_READ; sop[0].sem_num=SEM_READ;
sop[0].sem_op=-1; sop[0].sem_op=-1;
sop[0].sem_flg=IPC_NOWAIT | SEM_UNDO; /* no reason to wait */ sop[0].sem_flg=IPC_NOWAIT | SEM_UNDO; /* no reason to wait */
@ -91,7 +90,7 @@ void shm_write_signal(shm_sem semid)
} while (ret<0 && errno==EINTR); /* interrupted system call? */ } while (ret<0 && errno==EINTR); /* interrupted system call? */
if (ret<0) /* test for the error */ if (ret<0) /* test for the error */
WARN(sem,"(semid=%d,errno=%d): Failed semaphore unlock for write\n", WARN("(semid=%d,errno=%d): Failed semaphore unlock for write\n",
semid, errno); semid, errno);
} }
@ -100,7 +99,7 @@ void shm_read_signal(shm_sem semid)
struct sembuf sop[2]; struct sembuf sop[2];
int ret; int ret;
TRACE(sem,"(%d)\n",semid); TRACE("(%d)\n",semid);
sop[0].sem_num=SEM_READ; sop[0].sem_num=SEM_READ;
sop[0].sem_op=-1; sop[0].sem_op=-1;
sop[0].sem_flg=IPC_NOWAIT | SEM_UNDO; /* no reason to wait */ sop[0].sem_flg=IPC_NOWAIT | SEM_UNDO; /* no reason to wait */
@ -110,7 +109,7 @@ void shm_read_signal(shm_sem semid)
} while (ret<0 && errno==EINTR); /* interrupted system call? */ } while (ret<0 && errno==EINTR); /* interrupted system call? */
if (ret<0) /* test for the error */ if (ret<0) /* test for the error */
WARN(sem,"(semid=%d,errno=%d): Failed semaphore unlock for read\n", WARN("(semid=%d,errno=%d): Failed semaphore unlock for read\n",
semid, errno); semid, errno);
} }

2
ipc/shm_semaph_test.c
View file

@ -16,7 +16,7 @@
#include "shm_semaph.h" #include "shm_semaph.h"
#include <sys/shm.h> #include <sys/shm.h>
#define DEBUG_DEFINE_VARIABLES #define DEBUG_DEFINE_VARIABLES
#include <debug.h> #include "debugtools.h"
static volatile int * volatile data; static volatile int * volatile data;
static int isparent=0; static int isparent=0;

2
ipc/wine_test_stub.c
View file

@ -5,7 +5,7 @@
#include <win.h> #include <win.h>
#define DEBUG_DEFINE_VARIABLES #define DEBUG_DEFINE_VARIABLES
#define DEBUG_ALL #define DEBUG_ALL
#include <debug.h> #include "debugtools.h"
#define DDE_PROC2WIN(proc_idx) ( (HWND) ~( (proc_idx)+1) ) #define DDE_PROC2WIN(proc_idx) ( (HWND) ~( (proc_idx)+1) )
#define DDE_WIN2PROC(win) ( (int) ~(short) ((win)+1) ) #define DDE_WIN2PROC(win) ( (int) ~(short) ((win)+1) )

8
relay32/snoop.c
View file

@ -17,7 +17,7 @@
#include "selectors.h" #include "selectors.h"
#include "stackframe.h" #include "stackframe.h"
#include "debugstr.h" #include "debugstr.h"
#include "debug.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(snoop) DEFAULT_DEBUG_CHANNEL(snoop)
@ -141,7 +141,7 @@ SNOOP_RegisterDLL(HMODULE hmod,LPCSTR name,DWORD nrofordinals) {
memset((*dll)->funs,0,nrofordinals*sizeof(SNOOP_FUN)); memset((*dll)->funs,0,nrofordinals*sizeof(SNOOP_FUN));
if (!(*dll)->funs) { if (!(*dll)->funs) {
HeapFree(SystemHeap,0,*dll); HeapFree(SystemHeap,0,*dll);
FIXME(snoop,"out of memory\n"); FIXME("out of memory\n");
return; return;
} }
} }
@ -270,7 +270,7 @@ void WINAPI REGS_FUNC(SNOOP_Entry)( CONTEXT *context )
dll=dll->next; dll=dll->next;
} }
if (!dll) { if (!dll) {
FIXME(snoop,"entrypoint 0x%08lx not found\n",entry); FIXME("entrypoint 0x%08lx not found\n",entry);
return; /* oops */ return; /* oops */
} }
/* guess cdecl ... */ /* guess cdecl ... */
@ -365,7 +365,7 @@ void WINAPI REGS_FUNC(SNOOP_Return)( CONTEXT *context )
} }
#else /* !__i386__ */ #else /* !__i386__ */
void SNOOP_RegisterDLL(HMODULE hmod,LPCSTR name,DWORD nrofordinals) { void SNOOP_RegisterDLL(HMODULE hmod,LPCSTR name,DWORD nrofordinals) {
FIXME(snoop,"snooping works only on i386 for now.\n"); FIXME("snooping works only on i386 for now.\n");
return; return;
} }

6
relay32/utthunk.c
View file

@ -10,7 +10,7 @@
#include "selectors.h" #include "selectors.h"
#include "callback.h" #include "callback.h"
#include "process.h" #include "process.h"
#include "debug.h" #include "debugtools.h"
#include "debugstr.h" #include "debugstr.h"
DEFAULT_DEBUG_CHANNEL(thunk) DEFAULT_DEBUG_CHANNEL(thunk)
@ -103,7 +103,7 @@ DWORD WINAPI UTGlue32( FARPROC16 target, LPVOID lpBuff, DWORD dwUserDefined,
segptrList = HeapAlloc( GetProcessHeap(), 0, sizeof(SEGPTR)*nList ); segptrList = HeapAlloc( GetProcessHeap(), 0, sizeof(SEGPTR)*nList );
if ( !segptrList ) if ( !segptrList )
{ {
FIXME( thunk, "Unable to allocate segptrList!" ); FIXME("Unable to allocate segptrList!" );
return 0; return 0;
} }
@ -280,7 +280,7 @@ VOID WINAPI UTUnRegister( HMODULE hModule )
*/ */
WORD WINAPI UTInit16( DWORD x1, DWORD x2, DWORD x3, DWORD x4 ) WORD WINAPI UTInit16( DWORD x1, DWORD x2, DWORD x3, DWORD x4 )
{ {
FIXME( thunk, "(%08lx, %08lx, %08lx, %08lx): stub\n", x1, x2, x3, x4 ); FIXME("(%08lx, %08lx, %08lx, %08lx): stub\n", x1, x2, x3, x4 );
return 0; return 0;
} }