Skip to content

W
wine-winehq
Commit 73458b03 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

Changed // comments to /* */ so WINE compiles with non-gcc compilers

again.
parent 151170c4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 443 additions and 439 deletions
debugger/stabs.c
View file @ 73458b03
...@@ -164,7 +164,7 @@ DEBUG_FileSubNr2StabEnum(int filenr,int subnr) { ...@@ -164,7 +164,7 @@ DEBUG_FileSubNr2StabEnum(int filenr,int subnr) {
); );
memset( stab_types + curtypenum, 0, sizeof(struct datatype *) * (num_stab_types - curtypenum) ); memset( stab_types + curtypenum, 0, sizeof(struct datatype *) * (num_stab_types - curtypenum) );
} }
//fprintf(stderr,"(%d,%d) is %d\n",filenr,subnr,typenums[filenr][subnr]); /*fprintf(stderr,"(%d,%d) is %d\n",filenr,subnr,typenums[filenr][subnr]); */
return typenums[filenr][subnr]; return typenums[filenr][subnr];
} }
......
dlls/comctl32/animate.c
View file @ 73458b03
...@@ -152,7 +152,7 @@ ANIMATE_Open32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -152,7 +152,7 @@ ANIMATE_Open32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << ANIMATE_Open32W >> /* << ANIMATE_Open32W >> */
static LRESULT static LRESULT
...@@ -274,8 +274,8 @@ ANIMATE_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -274,8 +274,8 @@ ANIMATE_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case ACM_OPEN32A: case ACM_OPEN32A:
return ANIMATE_Open32A (wndPtr, wParam, lParam); return ANIMATE_Open32A (wndPtr, wParam, lParam);
// case ACM_OPEN32W: /* case ACM_OPEN32W: */
// return ANIMATE_Open32W (wndPtr, wParam, lParam); /* return ANIMATE_Open32W (wndPtr, wParam, lParam); */
case ACM_PLAY: case ACM_PLAY:
return ANIMATE_Play (wndPtr, wParam, lParam); return ANIMATE_Play (wndPtr, wParam, lParam);
...@@ -290,15 +290,15 @@ ANIMATE_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -290,15 +290,15 @@ ANIMATE_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_DESTROY: case WM_DESTROY:
return ANIMATE_Destroy (wndPtr, wParam, lParam); return ANIMATE_Destroy (wndPtr, wParam, lParam);
// case WM_ERASEBKGND: /* case WM_ERASEBKGND: */
// return ANIMATE_EraseBackground (wndPtr, wParam, lParam); /* return ANIMATE_EraseBackground (wndPtr, wParam, lParam); */
// case WM_NCCREATE: /* case WM_NCCREATE: */
// case WM_NCHITTEST: /* case WM_NCHITTEST: */
// case WM_PAINT: /* case WM_PAINT: */
// case WM_SIZE: /* case WM_SIZE: */
// case WM_STYLECHANGED: /* case WM_STYLECHANGED: */
// case WM_TIMER: /* case WM_TIMER: */
default: default:
if (uMsg >= WM_USER) if (uMsg >= WM_USER)
......
dlls/comctl32/header.c
View file @ 73458b03
...@@ -174,7 +174,7 @@ HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack) ...@@ -174,7 +174,7 @@ HEADER_DrawItem (WND *wndPtr, HDC32 hdc, INT32 iItem, BOOL32 bHotTrack)
if (phdi->fmt & HDF_IMAGE) { if (phdi->fmt & HDF_IMAGE) {
// ImageList_Draw (infoPtr->himl, phdi->iImage,...); /* ImageList_Draw (infoPtr->himl, phdi->iImage,...); */
} }
if ((phdi->fmt & HDF_STRING) && (phdi->pszText)) { if ((phdi->fmt & HDF_STRING) && (phdi->pszText)) {
...@@ -459,8 +459,8 @@ HEADER_SendHeaderNotify (WND *wndPtr, UINT32 code, INT32 iItem) ...@@ -459,8 +459,8 @@ HEADER_SendHeaderNotify (WND *wndPtr, UINT32 code, INT32 iItem)
nmitem.hbm = infoPtr->items[iItem].hbm; nmitem.hbm = infoPtr->items[iItem].hbm;
nmitem.pszText = NULL; nmitem.pszText = NULL;
nmitem.cchTextMax = 0; nmitem.cchTextMax = 0;
// nmitem.pszText = infoPtr->items[iItem].pszText; /* nmitem.pszText = infoPtr->items[iItem].pszText; */
// nmitem.cchTextMax = infoPtr->items[iItem].cchTextMax; /* nmitem.cchTextMax = infoPtr->items[iItem].cchTextMax; */
nmitem.fmt = infoPtr->items[iItem].fmt; nmitem.fmt = infoPtr->items[iItem].fmt;
nmitem.lParam = infoPtr->items[iItem].lParam; nmitem.lParam = infoPtr->items[iItem].lParam;
nmitem.iOrder = infoPtr->items[iItem].iOrder; nmitem.iOrder = infoPtr->items[iItem].iOrder;
...@@ -682,7 +682,7 @@ HEADER_GetItemRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -682,7 +682,7 @@ HEADER_GetItemRect (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << HEADER_GetOrderArray >> /* << HEADER_GetOrderArray >> */
__inline__ static LRESULT __inline__ static LRESULT
...@@ -1050,7 +1050,7 @@ HEADER_SetItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1050,7 +1050,7 @@ HEADER_SetItem32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << HEADER_SetOrderArray >> /* << HEADER_SetOrderArray >> */
__inline__ static LRESULT __inline__ static LRESULT
...@@ -1450,7 +1450,7 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam) ...@@ -1450,7 +1450,7 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
case HDM_GETITEMRECT: case HDM_GETITEMRECT:
return HEADER_GetItemRect (wndPtr, wParam, lParam); return HEADER_GetItemRect (wndPtr, wParam, lParam);
// case HDM_GETORDERARRAY: /* case HDM_GETORDERARRAY: */
case HDM_GETUNICODEFORMAT: case HDM_GETUNICODEFORMAT:
return HEADER_GetUnicodeFormat (wndPtr); return HEADER_GetUnicodeFormat (wndPtr);
...@@ -1476,7 +1476,7 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam) ...@@ -1476,7 +1476,7 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
case HDM_SETITEM32W: case HDM_SETITEM32W:
return HEADER_SetItem32W (wndPtr, wParam, lParam); return HEADER_SetItem32W (wndPtr, wParam, lParam);
// case HDM_SETORDERARRAY: /* case HDM_SETORDERARRAY: */
case HDM_SETUNICODEFORMAT: case HDM_SETUNICODEFORMAT:
return HEADER_SetUnicodeFormat (wndPtr, wParam); return HEADER_SetUnicodeFormat (wndPtr, wParam);
...@@ -1509,7 +1509,7 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam) ...@@ -1509,7 +1509,7 @@ HEADER_WindowProc (HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam)
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
return HEADER_MouseMove (wndPtr, wParam, lParam); return HEADER_MouseMove (wndPtr, wParam, lParam);
// case WM_NOTIFYFORMAT: /* case WM_NOTIFYFORMAT: */
case WM_PAINT: case WM_PAINT:
return HEADER_Paint (wndPtr, wParam); return HEADER_Paint (wndPtr, wParam);
......
dlls/comctl32/hotkey.c
View file @ 73458b03
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
#define HOTKEY_GetInfoPtr(wndPtr) ((HOTKEY_INFO *)wndPtr->wExtra[0]) #define HOTKEY_GetInfoPtr(wndPtr) ((HOTKEY_INFO *)wndPtr->wExtra[0])
// << HOTHEY_GetHotKey >> /* << HOTHEY_GetHotKey >> */
// << HOTHEY_SetHotKey >> /* << HOTHEY_SetHotKey >> */
// << HOTHEY_SetRules >> /* << HOTHEY_SetRules >> */
// << HOTKEY_Char >> /* << HOTKEY_Char >> */
static LRESULT static LRESULT
...@@ -164,7 +164,7 @@ HOTKEY_KillFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -164,7 +164,7 @@ HOTKEY_KillFocus (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
static LRESULT static LRESULT
HOTKEY_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) HOTKEY_LButtonDown (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
{ {
// HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); /* HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr(wndPtr); */
SetFocus32 (wndPtr->hwndSelf); SetFocus32 (wndPtr->hwndSelf);
...@@ -282,11 +282,11 @@ HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -282,11 +282,11 @@ HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
switch (uMsg) switch (uMsg)
{ {
// case HKM_GETHOTKEY: /* case HKM_GETHOTKEY: */
// case HKM_SETHOTKEY: /* case HKM_SETHOTKEY: */
// case HKM_SETRULES: /* case HKM_SETRULES: */
// case WM_CHAR: /* case WM_CHAR: */
case WM_CREATE: case WM_CREATE:
return HOTKEY_Create (wndPtr, wParam, lParam); return HOTKEY_Create (wndPtr, wParam, lParam);
...@@ -320,7 +320,7 @@ HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -320,7 +320,7 @@ HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_NCCREATE: case WM_NCCREATE:
return HOTKEY_NCCreate (wndPtr, wParam, lParam); return HOTKEY_NCCreate (wndPtr, wParam, lParam);
// case WM_PAINT: /* case WM_PAINT: */
case WM_SETFOCUS: case WM_SETFOCUS:
return HOTKEY_SetFocus (wndPtr, wParam, lParam); return HOTKEY_SetFocus (wndPtr, wParam, lParam);
...@@ -328,7 +328,7 @@ HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -328,7 +328,7 @@ HOTKEY_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_SETFONT: case WM_SETFONT:
return HOTKEY_SetFont (wndPtr, wParam, lParam); return HOTKEY_SetFont (wndPtr, wParam, lParam);
// case WM_SYSCHAR: /* case WM_SYSCHAR: */
default: default:
if (uMsg >= WM_USER) if (uMsg >= WM_USER)
......
dlls/comctl32/pager.c
View file @ 73458b03
...@@ -72,7 +72,7 @@ PAGER_GetButtonState (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -72,7 +72,7 @@ PAGER_GetButtonState (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << PAGER_GetDropTarget >> /* << PAGER_GetDropTarget >> */
static __inline__ LRESULT static __inline__ LRESULT
...@@ -251,7 +251,7 @@ PAGER_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -251,7 +251,7 @@ PAGER_EraseBackground (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
FillRect32 ((HDC32)wParam, &rect, hBrush); FillRect32 ((HDC32)wParam, &rect, hBrush);
DeleteObject32 (hBrush); DeleteObject32 (hBrush);
// return TRUE; /* return TRUE; */
return FALSE; return FALSE;
} }
...@@ -267,7 +267,7 @@ PAGER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -267,7 +267,7 @@ PAGER_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << PAGER_Paint >> /* << PAGER_Paint >> */
static LRESULT static LRESULT
...@@ -281,12 +281,12 @@ PAGER_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -281,12 +281,12 @@ PAGER_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
SetWindowPos32 (infoPtr->hwndChild, HWND_TOP, rect.left, rect.top, SetWindowPos32 (infoPtr->hwndChild, HWND_TOP, rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top, rect.right - rect.left, rect.bottom - rect.top,
SWP_SHOWWINDOW); SWP_SHOWWINDOW);
// MoveWindow32 (infoPtr->hwndChild, 1, 1, rect.right - 2, rect.bottom-2, TRUE); /* MoveWindow32 (infoPtr->hwndChild, 1, 1, rect.right - 2, rect.bottom-2, TRUE); */
// UpdateWindow32 (infoPtr->hwndChild); /* UpdateWindow32 (infoPtr->hwndChild); */
} }
// FillRect32 ((HDC32)wParam, &rect, hBrush); /* FillRect32 ((HDC32)wParam, &rect, hBrush); */
// DeleteObject32 (hBrush); /* DeleteObject32 (hBrush); */
return TRUE; return TRUE;
} }
...@@ -314,7 +314,7 @@ PAGER_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -314,7 +314,7 @@ PAGER_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case PGM_GETBUTTONSTATE: case PGM_GETBUTTONSTATE:
return PAGER_GetButtonState (wndPtr, wParam, lParam); return PAGER_GetButtonState (wndPtr, wParam, lParam);
// case PGM_GETDROPTARGET: /* case PGM_GETDROPTARGET: */
case PGM_GETPOS: case PGM_GETPOS:
return PAGER_SetPos (wndPtr, wParam, lParam); return PAGER_SetPos (wndPtr, wParam, lParam);
...@@ -349,8 +349,8 @@ PAGER_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -349,8 +349,8 @@ PAGER_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
return PAGER_MouseMove (wndPtr, wParam, lParam); return PAGER_MouseMove (wndPtr, wParam, lParam);
// case WM_PAINT: /* case WM_PAINT: */
// return PAGER_Paint (wndPtr, wParam); /* return PAGER_Paint (wndPtr, wParam); */
case WM_SIZE: case WM_SIZE:
return PAGER_Size (wndPtr, wParam, lParam); return PAGER_Size (wndPtr, wParam, lParam);
......
dlls/comctl32/rebar.c
View file @ 73458b03
...@@ -59,7 +59,7 @@ REBAR_DrawBand (HDC32 hdc, REBAR_INFO *infoPtr, REBAR_BAND *lpBand) ...@@ -59,7 +59,7 @@ REBAR_DrawBand (HDC32 hdc, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
pt.x = (lpBand->rcCapImage.right + lpBand->rcCapImage.left - infoPtr->imageSize.cx)/2; pt.x = (lpBand->rcCapImage.right + lpBand->rcCapImage.left - infoPtr->imageSize.cx)/2;
ImageList_Draw (infoPtr->himl, lpBand->iImage, hdc, ImageList_Draw (infoPtr->himl, lpBand->iImage, hdc,
// lpBand->rcCapImage.left, lpBand->rcCapImage.top, /* lpBand->rcCapImage.left, lpBand->rcCapImage.top, */
pt.x, pt.y, pt.x, pt.y,
ILD_TRANSPARENT); ILD_TRANSPARENT);
} }
...@@ -214,7 +214,7 @@ REBAR_CalcVertBand (WND *wndPtr, REBAR_INFO *infoPtr, REBAR_BAND *lpBand) ...@@ -214,7 +214,7 @@ REBAR_CalcVertBand (WND *wndPtr, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
lpBand->fDraw |= DRAW_TEXT; lpBand->fDraw |= DRAW_TEXT;
GetTextExtentPoint32W (hdc, lpBand->lpText, GetTextExtentPoint32W (hdc, lpBand->lpText,
lstrlen32W (lpBand->lpText), &size); lstrlen32W (lpBand->lpText), &size);
// lpBand->rcCapText.right += size.cx; /* lpBand->rcCapText.right += size.cx; */
lpBand->rcCapText.bottom += size.cy; lpBand->rcCapText.bottom += size.cy;
SelectObject32 (hdc, hOldFont); SelectObject32 (hdc, hOldFont);
...@@ -516,7 +516,7 @@ REBAR_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pBand ...@@ -516,7 +516,7 @@ REBAR_InternalHitTest (WND *wndPtr, LPPOINT32 lpPt, UINT32 *pFlags, INT32 *pBand
// << REBAR_BeginDrag >> /* << REBAR_BeginDrag >> */
static LRESULT static LRESULT
...@@ -563,8 +563,8 @@ REBAR_DeleteBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -563,8 +563,8 @@ REBAR_DeleteBand (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << REBAR_DragMove >> /* << REBAR_DragMove >> */
// << REBAR_EndDrag >> /* << REBAR_EndDrag >> */
static LRESULT static LRESULT
...@@ -781,8 +781,8 @@ REBAR_GetBkColor (WND *wndPtr) ...@@ -781,8 +781,8 @@ REBAR_GetBkColor (WND *wndPtr)
} }
// << REBAR_GetColorScheme >> /* << REBAR_GetColorScheme >> */
// << REBAR_GetDropTarget >> /* << REBAR_GetDropTarget >> */
static LRESULT static LRESULT
...@@ -836,7 +836,7 @@ REBAR_GetRowCount (WND *wndPtr) ...@@ -836,7 +836,7 @@ REBAR_GetRowCount (WND *wndPtr)
static LRESULT static LRESULT
REBAR_GetRowHeight (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) REBAR_GetRowHeight (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
{ {
// REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr); /* REBAR_INFO *infoPtr = REBAR_GetInfoPtr (wndPtr); */
FIXME (rebar, "-- height = 20: semi stub!\n"); FIXME (rebar, "-- height = 20: semi stub!\n");
...@@ -1171,9 +1171,9 @@ REBAR_InsertBand32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1171,9 +1171,9 @@ REBAR_InsertBand32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << REBAR_MaximizeBand >> /* << REBAR_MaximizeBand >> */
// << REBAR_MinimizeBand >> /* << REBAR_MinimizeBand >> */
// << REBAR_MoveBand >> /* << REBAR_MoveBand >> */
static LRESULT static LRESULT
...@@ -1227,7 +1227,7 @@ REBAR_SetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1227,7 +1227,7 @@ REBAR_SetBandInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
else { else {
FIXME (rebar, "child: 0x%x prev parent: 0x%x\n", FIXME (rebar, "child: 0x%x prev parent: 0x%x\n",
lpBand->hwndChild, lpBand->hwndPrevParent); lpBand->hwndChild, lpBand->hwndPrevParent);
// SetParent32 (lpBand->hwndChild, lpBand->hwndPrevParent); /* SetParent32 (lpBand->hwndChild, lpBand->hwndPrevParent); */
lpBand->hwndChild = 0; lpBand->hwndChild = 0;
lpBand->hwndPrevParent = 0; lpBand->hwndPrevParent = 0;
} }
...@@ -1322,7 +1322,7 @@ REBAR_SetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1322,7 +1322,7 @@ REBAR_SetBandInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
else { else {
FIXME (rebar, "child: 0x%x prev parent: 0x%x\n", FIXME (rebar, "child: 0x%x prev parent: 0x%x\n",
lpBand->hwndChild, lpBand->hwndPrevParent); lpBand->hwndChild, lpBand->hwndPrevParent);
// SetParent32 (lpBand->hwndChild, lpBand->hwndPrevParent); /* SetParent32 (lpBand->hwndChild, lpBand->hwndPrevParent); */
lpBand->hwndChild = 0; lpBand->hwndChild = 0;
lpBand->hwndPrevParent = 0; lpBand->hwndPrevParent = 0;
} }
...@@ -1411,8 +1411,8 @@ REBAR_SetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1411,8 +1411,8 @@ REBAR_SetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << REBAR_SetColorScheme >> /* << REBAR_SetColorScheme >> */
// << REBAR_SetPalette >> /* << REBAR_SetPalette >> */
static LRESULT static LRESULT
...@@ -1442,7 +1442,7 @@ REBAR_SetTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1442,7 +1442,7 @@ REBAR_SetTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << REBAR_SetTooltips >> /* << REBAR_SetTooltips >> */
__inline__ static LRESULT __inline__ static LRESULT
...@@ -1811,19 +1811,19 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1811,19 +1811,19 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
switch (uMsg) switch (uMsg)
{ {
// case RB_BEGINDRAG: /* case RB_BEGINDRAG: */
case RB_DELETEBAND: case RB_DELETEBAND:
return REBAR_DeleteBand (wndPtr, wParam, lParam); return REBAR_DeleteBand (wndPtr, wParam, lParam);
// case RB_DRAGMOVE: /* case RB_DRAGMOVE: */
// case RB_ENDDRAG: /* case RB_ENDDRAG: */
// case RB_GETBANDBORDERS: /* case RB_GETBANDBORDERS: */
case RB_GETBANDCOUNT: case RB_GETBANDCOUNT:
return REBAR_GetBandCount (wndPtr); return REBAR_GetBandCount (wndPtr);
// case RB_GETBANDINFO32: /* outdated, just for compatibility */ /* case RB_GETBANDINFO32: */ /* outdated, just for compatibility */
case RB_GETBANDINFO32A: case RB_GETBANDINFO32A:
return REBAR_GetBandInfo32A (wndPtr, wParam, lParam); return REBAR_GetBandInfo32A (wndPtr, wParam, lParam);
...@@ -1840,8 +1840,8 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1840,8 +1840,8 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case RB_GETBKCOLOR: case RB_GETBKCOLOR:
return REBAR_GetBkColor (wndPtr); return REBAR_GetBkColor (wndPtr);
// case RB_GETCOLORSCHEME: /* case RB_GETCOLORSCHEME: */
// case RB_GETDROPTARGET: /* case RB_GETDROPTARGET: */
case RB_GETPALETTE: case RB_GETPALETTE:
return REBAR_GetPalette (wndPtr, wParam, lParam); return REBAR_GetPalette (wndPtr, wParam, lParam);
...@@ -1876,9 +1876,9 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1876,9 +1876,9 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case RB_INSERTBAND32W: case RB_INSERTBAND32W:
return REBAR_InsertBand32W (wndPtr, wParam, lParam); return REBAR_InsertBand32W (wndPtr, wParam, lParam);
// case RB_MAXIMIZEBAND: /* case RB_MAXIMIZEBAND: */
// case RB_MINIMIZEBAND: /* case RB_MINIMIZEBAND: */
// case RB_MOVEBAND: /* case RB_MOVEBAND: */
case RB_SETBANDINFO32A: case RB_SETBANDINFO32A:
return REBAR_SetBandInfo32A (wndPtr, wParam, lParam); return REBAR_SetBandInfo32A (wndPtr, wParam, lParam);
...@@ -1892,8 +1892,8 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1892,8 +1892,8 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case RB_SETBKCOLOR: case RB_SETBKCOLOR:
return REBAR_SetBkColor (wndPtr, wParam, lParam); return REBAR_SetBkColor (wndPtr, wParam, lParam);
// case RB_SETCOLORSCHEME: /* case RB_SETCOLORSCHEME: */
// case RB_SETPALETTE: /* case RB_SETPALETTE: */
case RB_SETPARENT: case RB_SETPARENT:
return REBAR_SetParent (wndPtr, wParam, lParam); return REBAR_SetParent (wndPtr, wParam, lParam);
...@@ -1901,7 +1901,7 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1901,7 +1901,7 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case RB_SETTEXTCOLOR: case RB_SETTEXTCOLOR:
return REBAR_SetTextColor (wndPtr, wParam, lParam); return REBAR_SetTextColor (wndPtr, wParam, lParam);
// case RB_SETTOOLTIPS: /* case RB_SETTOOLTIPS: */
case RB_SETUNICODEFORMAT: case RB_SETUNICODEFORMAT:
return REBAR_SetUnicodeFormat (wndPtr, wParam); return REBAR_SetUnicodeFormat (wndPtr, wParam);
...@@ -1922,8 +1922,8 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1922,8 +1922,8 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_GETFONT: case WM_GETFONT:
return REBAR_GetFont (wndPtr, wParam, lParam); return REBAR_GetFont (wndPtr, wParam, lParam);
// case WM_MOUSEMOVE: /* case WM_MOUSEMOVE: */
// return REBAR_MouseMove (wndPtr, wParam, lParam); /* return REBAR_MouseMove (wndPtr, wParam, lParam); */
case WM_NCCALCSIZE: case WM_NCCALCSIZE:
return REBAR_NCCalcSize (wndPtr, wParam, lParam); return REBAR_NCCalcSize (wndPtr, wParam, lParam);
...@@ -1947,9 +1947,9 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1947,9 +1947,9 @@ REBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_SIZE: case WM_SIZE:
return REBAR_Size (wndPtr, wParam, lParam); return REBAR_Size (wndPtr, wParam, lParam);
// case WM_TIMER: /* case WM_TIMER: */
// case WM_WININICHANGE: /* case WM_WININICHANGE: */
default: default:
if (uMsg >= WM_USER) if (uMsg >= WM_USER)
......
dlls/comctl32/tooltips.c
View file @ 73458b03
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
extern LPSTR COMCTL32_aSubclass; /* global subclassing atom */ extern LPSTR COMCTL32_aSubclass; /* global subclassing atom */
/* property name of tooltip window handle */ /* property name of tooltip window handle */
//#define TT_SUBCLASS_PROP "CC32SubclassInfo" /*#define TT_SUBCLASS_PROP "CC32SubclassInfo" */
#define TOOLTIPS_GetInfoPtr(wndPtr) ((TOOLTIPS_INFO *)wndPtr->wExtra[0]) #define TOOLTIPS_GetInfoPtr(wndPtr) ((TOOLTIPS_INFO *)wndPtr->wExtra[0])
...@@ -934,7 +934,7 @@ TOOLTIPS_EnumTools32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -934,7 +934,7 @@ TOOLTIPS_EnumTools32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
lpToolInfo->uId = toolPtr->uId; lpToolInfo->uId = toolPtr->uId;
lpToolInfo->rect = toolPtr->rect; lpToolInfo->rect = toolPtr->rect;
lpToolInfo->hinst = toolPtr->hinst; lpToolInfo->hinst = toolPtr->hinst;
// lpToolInfo->lpszText = toolPtr->lpszText; /* lpToolInfo->lpszText = toolPtr->lpszText; */
lpToolInfo->lpszText = NULL; /* FIXME */ lpToolInfo->lpszText = NULL; /* FIXME */
if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A)) if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A))
...@@ -969,7 +969,7 @@ TOOLTIPS_EnumTools32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -969,7 +969,7 @@ TOOLTIPS_EnumTools32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
lpToolInfo->uId = toolPtr->uId; lpToolInfo->uId = toolPtr->uId;
lpToolInfo->rect = toolPtr->rect; lpToolInfo->rect = toolPtr->rect;
lpToolInfo->hinst = toolPtr->hinst; lpToolInfo->hinst = toolPtr->hinst;
// lpToolInfo->lpszText = toolPtr->lpszText; /* lpToolInfo->lpszText = toolPtr->lpszText; */
lpToolInfo->lpszText = NULL; /* FIXME */ lpToolInfo->lpszText = NULL; /* FIXME */
if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W)) if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W))
...@@ -999,7 +999,7 @@ TOOLTIPS_GetCurrentTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -999,7 +999,7 @@ TOOLTIPS_GetCurrentTool32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
lpToolInfo->uFlags = toolPtr->uFlags; lpToolInfo->uFlags = toolPtr->uFlags;
lpToolInfo->rect = toolPtr->rect; lpToolInfo->rect = toolPtr->rect;
lpToolInfo->hinst = toolPtr->hinst; lpToolInfo->hinst = toolPtr->hinst;
// lpToolInfo->lpszText = toolPtr->lpszText; /* lpToolInfo->lpszText = toolPtr->lpszText; */
lpToolInfo->lpszText = NULL; /* FIXME */ lpToolInfo->lpszText = NULL; /* FIXME */
if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A)) if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A))
...@@ -1037,7 +1037,7 @@ TOOLTIPS_GetCurrentTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1037,7 +1037,7 @@ TOOLTIPS_GetCurrentTool32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
lpToolInfo->uFlags = toolPtr->uFlags; lpToolInfo->uFlags = toolPtr->uFlags;
lpToolInfo->rect = toolPtr->rect; lpToolInfo->rect = toolPtr->rect;
lpToolInfo->hinst = toolPtr->hinst; lpToolInfo->hinst = toolPtr->hinst;
// lpToolInfo->lpszText = toolPtr->lpszText; /* lpToolInfo->lpszText = toolPtr->lpszText; */
lpToolInfo->lpszText = NULL; /* FIXME */ lpToolInfo->lpszText = NULL; /* FIXME */
if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W)) if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W))
...@@ -1195,7 +1195,7 @@ TOOLTIPS_GetToolInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1195,7 +1195,7 @@ TOOLTIPS_GetToolInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
lpToolInfo->uFlags = toolPtr->uFlags; lpToolInfo->uFlags = toolPtr->uFlags;
lpToolInfo->rect = toolPtr->rect; lpToolInfo->rect = toolPtr->rect;
lpToolInfo->hinst = toolPtr->hinst; lpToolInfo->hinst = toolPtr->hinst;
// lpToolInfo->lpszText = toolPtr->lpszText; /* lpToolInfo->lpszText = toolPtr->lpszText; */
lpToolInfo->lpszText = NULL; /* FIXME */ lpToolInfo->lpszText = NULL; /* FIXME */
if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A)) if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32A))
...@@ -1232,7 +1232,7 @@ TOOLTIPS_GetToolInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1232,7 +1232,7 @@ TOOLTIPS_GetToolInfo32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
lpToolInfo->uFlags = toolPtr->uFlags; lpToolInfo->uFlags = toolPtr->uFlags;
lpToolInfo->rect = toolPtr->rect; lpToolInfo->rect = toolPtr->rect;
lpToolInfo->hinst = toolPtr->hinst; lpToolInfo->hinst = toolPtr->hinst;
// lpToolInfo->lpszText = toolPtr->lpszText; /* lpToolInfo->lpszText = toolPtr->lpszText; */
lpToolInfo->lpszText = NULL; /* FIXME */ lpToolInfo->lpszText = NULL; /* FIXME */
if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W)) if (lpToolInfo->cbSize >= sizeof(TTTOOLINFO32W))
...@@ -1268,7 +1268,7 @@ TOOLTIPS_HitTest32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1268,7 +1268,7 @@ TOOLTIPS_HitTest32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
lptthit->ti.uId = toolPtr->uId; lptthit->ti.uId = toolPtr->uId;
lptthit->ti.rect = toolPtr->rect; lptthit->ti.rect = toolPtr->rect;
lptthit->ti.hinst = toolPtr->hinst; lptthit->ti.hinst = toolPtr->hinst;
// lptthit->ti.lpszText = toolPtr->lpszText; /* lptthit->ti.lpszText = toolPtr->lpszText; */
lptthit->ti.lpszText = NULL; /* FIXME */ lptthit->ti.lpszText = NULL; /* FIXME */
lptthit->ti.lParam = toolPtr->lParam; lptthit->ti.lParam = toolPtr->lParam;
} }
...@@ -1303,7 +1303,7 @@ TOOLTIPS_HitTest32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1303,7 +1303,7 @@ TOOLTIPS_HitTest32W (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
lptthit->ti.uId = toolPtr->uId; lptthit->ti.uId = toolPtr->uId;
lptthit->ti.rect = toolPtr->rect; lptthit->ti.rect = toolPtr->rect;
lptthit->ti.hinst = toolPtr->hinst; lptthit->ti.hinst = toolPtr->hinst;
// lptthit->ti.lpszText = toolPtr->lpszText; /* lptthit->ti.lpszText = toolPtr->lpszText; */
lptthit->ti.lpszText = NULL; /* FIXME */ lptthit->ti.lpszText = NULL; /* FIXME */
lptthit->ti.lParam = toolPtr->lParam; lptthit->ti.lParam = toolPtr->lParam;
} }
...@@ -2245,8 +2245,8 @@ TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -2245,8 +2245,8 @@ TOOLTIPS_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_NCHITTEST: case WM_NCHITTEST:
return TOOLTIPS_NCHitTest (wndPtr, wParam, lParam); return TOOLTIPS_NCHitTest (wndPtr, wParam, lParam);
// case WM_NOTIFYFORMAT: /* case WM_NOTIFYFORMAT: */
// return TOOLTIPS_NotifyFormat (wndPtr, wParam, lParam); /* return TOOLTIPS_NotifyFormat (wndPtr, wParam, lParam); */
case WM_PAINT: case WM_PAINT:
return TOOLTIPS_Paint (wndPtr, wParam, lParam); return TOOLTIPS_Paint (wndPtr, wParam, lParam);
......
dlls/comctl32/trackbar.c
View file @ 73458b03
...@@ -475,7 +475,7 @@ TRACKBAR_Refresh (WND *wndPtr, HDC32 hdc) ...@@ -475,7 +475,7 @@ TRACKBAR_Refresh (WND *wndPtr, HDC32 hdc)
Polygon32 (hdc, points, 6); Polygon32 (hdc, points, 6);
if (wndPtr->dwStyle & TBS_VERT) { if (wndPtr->dwStyle & TBS_VERT) {
// draw edge /* draw edge */
} else { } else {
RECT32 triangle; /* for correct shadows of thumb */ RECT32 triangle; /* for correct shadows of thumb */
DrawEdge32 (hdc, &thumb, EDGE_RAISED, BF_TOPLEFT); DrawEdge32 (hdc, &thumb, EDGE_RAISED, BF_TOPLEFT);
...@@ -788,7 +788,7 @@ TRACKBAR_GetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -788,7 +788,7 @@ TRACKBAR_GetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// case TBM_GETUNICODEFORMAT: /* case TBM_GETUNICODEFORMAT: */
static LRESULT static LRESULT
...@@ -1101,7 +1101,7 @@ TRACKBAR_SetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1101,7 +1101,7 @@ TRACKBAR_SetToolTips (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// case TBM_SETUNICODEFORMAT: /* case TBM_SETUNICODEFORMAT: */
static LRESULT static LRESULT
...@@ -1171,7 +1171,7 @@ TRACKBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1171,7 +1171,7 @@ TRACKBAR_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
ti.uFlags = TTF_IDISHWND | TTF_TRACK; ti.uFlags = TTF_IDISHWND | TTF_TRACK;
ti.hwnd = wndPtr->hwndSelf; ti.hwnd = wndPtr->hwndSelf;
ti.uId = 0; ti.uId = 0;
ti.lpszText = "Test"; // LPSTR_TEXTCALLBACK; ti.lpszText = "Test"; /* LPSTR_TEXTCALLBACK */
SetRectEmpty32 (&ti.rect); SetRectEmpty32 (&ti.rect);
SendMessage32A (infoPtr->hwndToolTip, TTM_ADDTOOL32A, 0, (LPARAM)&ti); SendMessage32A (infoPtr->hwndToolTip, TTM_ADDTOOL32A, 0, (LPARAM)&ti);
...@@ -1538,7 +1538,7 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1538,7 +1538,7 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
{ {
WND *wndPtr = WIN_FindWndPtr(hwnd); WND *wndPtr = WIN_FindWndPtr(hwnd);
// TRACE (trackbar, "msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); /* TRACE (trackbar, "msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); */
switch (uMsg) switch (uMsg)
{ {
...@@ -1596,7 +1596,7 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1596,7 +1596,7 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TBM_GETTOOLTIPS: case TBM_GETTOOLTIPS:
return TRACKBAR_GetToolTips (wndPtr, wParam, lParam); return TRACKBAR_GetToolTips (wndPtr, wParam, lParam);
// case TBM_GETUNICODEFORMAT: /* case TBM_GETUNICODEFORMAT: */
case TBM_SETBUDDY: case TBM_SETBUDDY:
return TRACKBAR_SetBuddy (wndPtr, wParam, lParam); return TRACKBAR_SetBuddy (wndPtr, wParam, lParam);
...@@ -1644,7 +1644,7 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1644,7 +1644,7 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TBM_SETTOOLTIPS: case TBM_SETTOOLTIPS:
return TRACKBAR_SetToolTips (wndPtr, wParam, lParam); return TRACKBAR_SetToolTips (wndPtr, wParam, lParam);
// case TBM_SETUNICODEFORMAT: /* case TBM_SETUNICODEFORMAT: */
case WM_CAPTURECHANGED: case WM_CAPTURECHANGED:
...@@ -1656,10 +1656,10 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1656,10 +1656,10 @@ TRACKBAR_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_DESTROY: case WM_DESTROY:
return TRACKBAR_Destroy (wndPtr, wParam, lParam); return TRACKBAR_Destroy (wndPtr, wParam, lParam);
// case WM_ENABLE: /* case WM_ENABLE: */
// case WM_ERASEBKGND: /* case WM_ERASEBKGND: */
// return 0; /* return 0; */
case WM_GETDLGCODE: case WM_GETDLGCODE:
return DLGC_WANTARROWS; return DLGC_WANTARROWS;
......
dlls/comctl32/treeview.c
View file @ 73458b03
...@@ -436,7 +436,7 @@ TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem, ...@@ -436,7 +436,7 @@ TREEVIEW_DrawItem (WND *wndPtr, HDC32 hdc, TREEVIEW_ITEM *wineItem,
DrawText32A (hdc, wineItem->pszText, lstrlen32A(wineItem->pszText), DrawText32A (hdc, wineItem->pszText, lstrlen32A(wineItem->pszText),
&r, uTextJustify|DT_VCENTER|DT_SINGLELINE); &r, uTextJustify|DT_VCENTER|DT_SINGLELINE);
else { else {
// send TVN_GETDISPINFO notification /* send TVN_GETDISPINFO notification */
TRACE (treeview,"LPSTR_TEXTCALLBACK\n"); TRACE (treeview,"LPSTR_TEXTCALLBACK\n");
} }
if (oldBkMode != TRANSPARENT) if (oldBkMode != TRANSPARENT)
...@@ -1171,7 +1171,7 @@ TREEVIEW_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) ...@@ -1171,7 +1171,7 @@ TREEVIEW_Create (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_TRANSPARENT ; ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_TRANSPARENT ;
ti.hwnd = wndPtr->hwndSelf; ti.hwnd = wndPtr->hwndSelf;
ti.uId = 0; ti.uId = 0;
ti.lpszText = "Test"; // LPSTR_TEXTCALLBACK; ti.lpszText = "Test"; /* LPSTR_TEXTCALLBACK; */
SetRectEmpty32 (&ti.rect); SetRectEmpty32 (&ti.rect);
SendMessage32A (infoPtr->hwndToolTip, TTM_ADDTOOL32A, 0, (LPARAM)&ti); SendMessage32A (infoPtr->hwndToolTip, TTM_ADDTOOL32A, 0, (LPARAM)&ti);
...@@ -1860,7 +1860,7 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1860,7 +1860,7 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
FIXME (treeview, "Unimplemented msg TVM_GETUNICODEFORMAT\n"); FIXME (treeview, "Unimplemented msg TVM_GETUNICODEFORMAT\n");
return 0; return 0;
// case WM_COMMAND: /* case WM_COMMAND: */
case WM_CREATE: case WM_CREATE:
return TREEVIEW_Create (wndPtr, wParam, lParam); return TREEVIEW_Create (wndPtr, wParam, lParam);
...@@ -1868,7 +1868,7 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1868,7 +1868,7 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_DESTROY: case WM_DESTROY:
return TREEVIEW_Destroy (wndPtr); return TREEVIEW_Destroy (wndPtr);
// case WM_ENABLE: /* case WM_ENABLE: */
case WM_ERASEBKGND: case WM_ERASEBKGND:
return TREEVIEW_EraseBackground (wndPtr, wParam, lParam); return TREEVIEW_EraseBackground (wndPtr, wParam, lParam);
...@@ -1889,8 +1889,8 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1889,8 +1889,8 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
return TREEVIEW_KeyDown (wndPtr, wParam, lParam); return TREEVIEW_KeyDown (wndPtr, wParam, lParam);
// case WM_KILLFOCUS: /* case WM_KILLFOCUS: */
// case WM_SETFOCUS: /* case WM_SETFOCUS: */
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
...@@ -1903,14 +1903,14 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) ...@@ -1903,14 +1903,14 @@ TREEVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
return TREEVIEW_RButtonDown (wndPtr, wParam, lParam); return TREEVIEW_RButtonDown (wndPtr, wParam, lParam);
// case WM_SYSCOLORCHANGE: /* case WM_SYSCOLORCHANGE: */
// case WM_STYLECHANGED: /* case WM_STYLECHANGED: */
// case WM_SETREDRAW: /* case WM_SETREDRAW: */
case WM_TIMER: case WM_TIMER:
return TREEVIEW_HandleTimer (wndPtr, wParam, lParam); return TREEVIEW_HandleTimer (wndPtr, wParam, lParam);
// case WM_SIZE: /* case WM_SIZE: */
case WM_HSCROLL: case WM_HSCROLL:
return TREEVIEW_HScroll (wndPtr, wParam, lParam); return TREEVIEW_HScroll (wndPtr, wParam, lParam);
case WM_VSCROLL: case WM_VSCROLL:
......
dlls/shell32/contmenu.c
View file @ 73458b03
...@@ -321,7 +321,7 @@ static HRESULT WINAPI IContextMenu_HandleMenuMsg(LPCONTEXTMENU this, UINT32 uMsg ...@@ -321,7 +321,7 @@ static HRESULT WINAPI IContextMenu_HandleMenuMsg(LPCONTEXTMENU this, UINT32 uMsg
* IContextMenu_AllocPidlTable() * IContextMenu_AllocPidlTable()
*/ */
BOOL32 IContextMenu_AllocPidlTable(LPCONTEXTMENU this, DWORD dwEntries) BOOL32 IContextMenu_AllocPidlTable(LPCONTEXTMENU this, DWORD dwEntries)
{ //add one for NULL terminator { /*add one for NULL terminator */
TRACE(shell,"(%p)->(entrys=%lu)\n",this, dwEntries); TRACE(shell,"(%p)->(entrys=%lu)\n",this, dwEntries);
dwEntries++; dwEntries++;
......
dlls/shell32/enumidlist.c
View file @ 73458b03
...@@ -230,7 +230,7 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa ...@@ -230,7 +230,7 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa
so we need to fake an enumeration of those.*/ so we need to fake an enumeration of those.*/
if(!lpszPath) if(!lpszPath)
{ TRACE (shell,"-- (%p)-> enumerate SHCONTF_FOLDERS (special) items\n",this); { TRACE (shell,"-- (%p)-> enumerate SHCONTF_FOLDERS (special) items\n",this);
//create the pidl for this item /*create the pidl for this item */
pidl = _ILCreateMyComputer(); pidl = _ILCreateMyComputer();
if(pidl) if(pidl)
{ pData = _ILGetDataPointer(pidl); { pData = _ILGetDataPointer(pidl);
...@@ -290,7 +290,7 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa ...@@ -290,7 +290,7 @@ static BOOL32 WINAPI IEnumIDList_CreateEnumList(LPENUMIDLIST this, LPCSTR lpszPa
} }
} }
} }
//enumerate the non-folder items (values) /*enumerate the non-folder items (values) */
if(dwFlags & SHCONTF_NONFOLDERS) if(dwFlags & SHCONTF_NONFOLDERS)
{ if(lpszPath) { if(lpszPath)
{ TRACE (shell,"-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n",this,debugstr_a(szPath)); { TRACE (shell,"-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n",this,debugstr_a(szPath));
...@@ -336,22 +336,22 @@ static BOOL32 WINAPI IEnumIDList_AddToEnumList(LPENUMIDLIST this,LPITEMIDLIST pi ...@@ -336,22 +336,22 @@ static BOOL32 WINAPI IEnumIDList_AddToEnumList(LPENUMIDLIST this,LPITEMIDLIST pi
TRACE(shell,"(%p)->(pidl=%p)\n",this,pidl); TRACE(shell,"(%p)->(pidl=%p)\n",this,pidl);
pNew = (LPENUMLIST)SHAlloc(sizeof(ENUMLIST)); pNew = (LPENUMLIST)SHAlloc(sizeof(ENUMLIST));
if(pNew) if(pNew)
{ //set the next pointer { /*set the next pointer */
pNew->pNext = NULL; pNew->pNext = NULL;
pNew->pidl = pidl; pNew->pidl = pidl;
//is this the first item in the list? /*is this the first item in the list? */
if(!this->mpFirst) if(!this->mpFirst)
{ this->mpFirst = pNew; { this->mpFirst = pNew;
this->mpCurrent = pNew; this->mpCurrent = pNew;
} }
if(this->mpLast) if(this->mpLast)
{ //add the new item to the end of the list { /*add the new item to the end of the list */
this->mpLast->pNext = pNew; this->mpLast->pNext = pNew;
} }
//update the last item pointer /*update the last item pointer */
this->mpLast = pNew; this->mpLast = pNew;
TRACE(shell,"-- (%p)->(first=%p, last=%p)\n",this,this->mpFirst,this->mpLast); TRACE(shell,"-- (%p)->(first=%p, last=%p)\n",this,this->mpFirst,this->mpLast);
return TRUE; return TRUE;
......
dlls/shell32/pidl.c
View file @ 73458b03
...@@ -665,7 +665,7 @@ DWORD WINAPI _ILGetFolderText(LPCITEMIDLIST pidl,LPSTR lpszPath, DWORD dwSize) ...@@ -665,7 +665,7 @@ DWORD WINAPI _ILGetFolderText(LPCITEMIDLIST pidl,LPSTR lpszPath, DWORD dwSize)
{ pidlTemp = (LPITEMIDLIST)pidl; { pidlTemp = (LPITEMIDLIST)pidl;
} }
//if this is NULL, return the required size of the buffer /*if this is NULL, return the required size of the buffer */
if(!lpszPath) if(!lpszPath)
{ while(pidlTemp->mkid.cb) { while(pidlTemp->mkid.cb)
{ LPPIDLDATA pData = _ILGetDataPointer(pidlTemp); { LPPIDLDATA pData = _ILGetDataPointer(pidlTemp);
...@@ -677,7 +677,7 @@ DWORD WINAPI _ILGetFolderText(LPCITEMIDLIST pidl,LPSTR lpszPath, DWORD dwSize) ...@@ -677,7 +677,7 @@ DWORD WINAPI _ILGetFolderText(LPCITEMIDLIST pidl,LPSTR lpszPath, DWORD dwSize)
pidlTemp = ILGetNext(pidlTemp); pidlTemp = ILGetNext(pidlTemp);
} }
//add one for the NULL terminator /*add one for the NULL terminator */
TRACE(pidl,"-- (size=%lu)\n",dwCopied); TRACE(pidl,"-- (size=%lu)\n",dwCopied);
return dwCopied + 1; return dwCopied + 1;
} }
...@@ -687,7 +687,7 @@ DWORD WINAPI _ILGetFolderText(LPCITEMIDLIST pidl,LPSTR lpszPath, DWORD dwSize) ...@@ -687,7 +687,7 @@ DWORD WINAPI _ILGetFolderText(LPCITEMIDLIST pidl,LPSTR lpszPath, DWORD dwSize)
while(pidlTemp->mkid.cb && (dwCopied < dwSize)) while(pidlTemp->mkid.cb && (dwCopied < dwSize))
{ LPPIDLDATA pData = _ILGetDataPointer(pidlTemp); { LPPIDLDATA pData = _ILGetDataPointer(pidlTemp);
//if this item is a value, then skip it and finish /*if this item is a value, then skip it and finish */
if(PT_VALUE == pData->type) if(PT_VALUE == pData->type)
{ break; { break;
} }
...@@ -700,7 +700,7 @@ DWORD WINAPI _ILGetFolderText(LPCITEMIDLIST pidl,LPSTR lpszPath, DWORD dwSize) ...@@ -700,7 +700,7 @@ DWORD WINAPI _ILGetFolderText(LPCITEMIDLIST pidl,LPSTR lpszPath, DWORD dwSize)
TRACE(pidl,"-- (size=%lu,%s)\n",dwCopied,lpszPath); TRACE(pidl,"-- (size=%lu,%s)\n",dwCopied,lpszPath);
} }
//remove the last backslash if necessary /*remove the last backslash if necessary */
if(dwCopied) if(dwCopied)
{ if(*(lpszPath + strlen(lpszPath) - 1) == '\\') { if(*(lpszPath + strlen(lpszPath) - 1) == '\\')
{ *(lpszPath + strlen(lpszPath) - 1) = 0; { *(lpszPath + strlen(lpszPath) - 1) = 0;
...@@ -762,7 +762,7 @@ DWORD WINAPI _ILGetDataText( LPCITEMIDLIST pidlPath, LPCITEMIDLIST pidlValue, LP ...@@ -762,7 +762,7 @@ DWORD WINAPI _ILGetDataText( LPCITEMIDLIST pidlPath, LPCITEMIDLIST pidlValue, LP
/* fixme: get the driveletter*/ /* fixme: get the driveletter*/
//assemble the Folder string /*assemble the Folder string */
dwNameSize = _ILGetFolderText(pidlPath, NULL, 0); dwNameSize = _ILGetFolderText(pidlPath, NULL, 0);
lpszFolder = (LPSTR)HeapAlloc(GetProcessHeap(),0,dwNameSize); lpszFolder = (LPSTR)HeapAlloc(GetProcessHeap(),0,dwNameSize);
if(!lpszFolder) if(!lpszFolder)
...@@ -770,7 +770,7 @@ DWORD WINAPI _ILGetDataText( LPCITEMIDLIST pidlPath, LPCITEMIDLIST pidlValue, LP ...@@ -770,7 +770,7 @@ DWORD WINAPI _ILGetDataText( LPCITEMIDLIST pidlPath, LPCITEMIDLIST pidlValue, LP
} }
_ILGetFolderText(pidlPath, lpszFolder, dwNameSize); _ILGetFolderText(pidlPath, lpszFolder, dwNameSize);
//assemble the value name /*assemble the value name */
dwNameSize = _ILGetValueText(pidlValue, NULL, 0); dwNameSize = _ILGetValueText(pidlValue, NULL, 0);
lpszValueName = (LPSTR)HeapAlloc(GetProcessHeap(),0,dwNameSize); lpszValueName = (LPSTR)HeapAlloc(GetProcessHeap(),0,dwNameSize);
if(!lpszValueName) if(!lpszValueName)
...@@ -809,7 +809,7 @@ DWORD WINAPI _ILGetPidlPath( LPCITEMIDLIST pidl, LPSTR lpszOut, DWORD dwOutSize) ...@@ -809,7 +809,7 @@ DWORD WINAPI _ILGetPidlPath( LPCITEMIDLIST pidl, LPSTR lpszOut, DWORD dwOutSize)
dwOutSize -= _ILGetFolderText(pidl, lpszTemp, dwOutSize); dwOutSize -= _ILGetFolderText(pidl, lpszTemp, dwOutSize);
//add a backslash if necessary /*add a backslash if necessary */
len = strlen(lpszTemp); len = strlen(lpszTemp);
if (len && lpszTemp[len-1]!='\\') if (len && lpszTemp[len-1]!='\\')
{ lpszTemp[len+0]='\\'; { lpszTemp[len+0]='\\';
...@@ -819,10 +819,10 @@ DWORD WINAPI _ILGetPidlPath( LPCITEMIDLIST pidl, LPSTR lpszOut, DWORD dwOutSize) ...@@ -819,10 +819,10 @@ DWORD WINAPI _ILGetPidlPath( LPCITEMIDLIST pidl, LPSTR lpszOut, DWORD dwOutSize)
lpszTemp = lpszOut + strlen(lpszOut); lpszTemp = lpszOut + strlen(lpszOut);
//add the value string /*add the value string */
_ILGetValueText(pidl, lpszTemp, dwOutSize); _ILGetValueText(pidl, lpszTemp, dwOutSize);
//remove the last backslash if necessary /*remove the last backslash if necessary */
if(*(lpszOut + strlen(lpszOut) - 1) == '\\') if(*(lpszOut + strlen(lpszOut) - 1) == '\\')
{ *(lpszOut + strlen(lpszOut) - 1) = 0; { *(lpszOut + strlen(lpszOut) - 1) = 0;
} }
......
dlls/shell32/shellord.c
View file @ 73458b03
...@@ -242,9 +242,9 @@ ShellMessageBoxA(HMODULE32 hmod,HWND32 hwnd,DWORD id,DWORD x,DWORD type,LPVOID a ...@@ -242,9 +242,9 @@ ShellMessageBoxA(HMODULE32 hmod,HWND32 hwnd,DWORD id,DWORD x,DWORD type,LPVOID a
if (!LoadString32A(hmod,x,buf,100)) if (!LoadString32A(hmod,x,buf,100))
strcpy(buf,"Desktop"); strcpy(buf,"Desktop");
// LoadString32A(hmod,id,buf2,100); /* LoadString32A(hmod,id,buf2,100); */
/* FIXME: the varargs handling doesn't. */ /* FIXME: the varargs handling doesn't. */
// FormatMessage32A(0x500,buf2,0,0,(LPSTR)&buf3,256,(LPDWORD)&args); /* FormatMessage32A(0x500,buf2,0,0,(LPSTR)&buf3,256,(LPDWORD)&args); */
FIXME(shell,"(%08lx,%08lx,%08lx(%s),%08lx(%s),%08lx,%p):stub.\n", FIXME(shell,"(%08lx,%08lx,%08lx(%s),%08lx(%s),%08lx,%p):stub.\n",
(DWORD)hmod,(DWORD)hwnd,id,buf2,x,buf,type,arglist (DWORD)hmod,(DWORD)hwnd,id,buf2,x,buf,type,arglist
......
dlls/shell32/shlview.c
View file @ 73458b03
...@@ -67,7 +67,7 @@ static struct IShellView_VTable svvt = ...@@ -67,7 +67,7 @@ static struct IShellView_VTable svvt =
IShellView_GetItemObject IShellView_GetItemObject
}; };
//menu items /*menu items */
#define IDM_VIEW_FILES (FCIDM_SHVIEWFIRST + 0x500) #define IDM_VIEW_FILES (FCIDM_SHVIEWFIRST + 0x500)
#define IDM_VIEW_IDW (FCIDM_SHVIEWFIRST + 0x501) #define IDM_VIEW_IDW (FCIDM_SHVIEWFIRST + 0x501)
#define IDM_MYFILEITEM (FCIDM_SHVIEWFIRST + 0x502) #define IDM_MYFILEITEM (FCIDM_SHVIEWFIRST + 0x502)
...@@ -78,11 +78,11 @@ static struct IShellView_VTable svvt = ...@@ -78,11 +78,11 @@ static struct IShellView_VTable svvt =
#define MENU_MAX 100 #define MENU_MAX 100
#define TOOLBAR_ID (L"SHELLDLL_DefView") #define TOOLBAR_ID (L"SHELLDLL_DefView")
//windowsx.h /*windowsx.h */
#define GET_WM_COMMAND_ID(wp, lp) LOWORD(wp) #define GET_WM_COMMAND_ID(wp, lp) LOWORD(wp)
#define GET_WM_COMMAND_HWND(wp, lp) (HWND32)(lp) #define GET_WM_COMMAND_HWND(wp, lp) (HWND32)(lp)
#define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp) #define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp)
// winuser.h /* winuser.h */
#define WM_SETTINGCHANGE WM_WININICHANGE #define WM_SETTINGCHANGE WM_WININICHANGE
extern void WINAPI _InsertMenuItem (HMENU32 hmenu, UINT32 indexMenu, BOOL32 fByPosition, extern void WINAPI _InsertMenuItem (HMENU32 hmenu, UINT32 indexMenu, BOOL32 fByPosition,
UINT32 wID, UINT32 fType, LPSTR dwTypeData, UINT32 fState); UINT32 wID, UINT32 fType, LPSTR dwTypeData, UINT32 fState);
...@@ -204,14 +204,14 @@ static void MergeToolBar(LPSHELLVIEW this) ...@@ -204,14 +204,14 @@ static void MergeToolBar(LPSHELLVIEW this)
TRACE(shell,"\n"); TRACE(shell,"\n");
ab.hInst = HINST_COMMCTRL; // hinstCommctrl ab.hInst = HINST_COMMCTRL; /* hinstCommctrl */
ab.nID = IDB_STD_SMALL_COLOR; // std bitmaps ab.nID = IDB_STD_SMALL_COLOR; /* std bitmaps */
IShellBrowser_SendControlMsg(this->pShellBrowser,FCW_TOOLBAR, IShellBrowser_SendControlMsg(this->pShellBrowser,FCW_TOOLBAR,
TB_ADDBITMAP, 8, (LPARAM)&ab, &iStdBMOffset); TB_ADDBITMAP, 8, (LPARAM)&ab, &iStdBMOffset);
TRACE(shell,"TB_ADDBITMAP returns %lx\n", iStdBMOffset); TRACE(shell,"TB_ADDBITMAP returns %lx\n", iStdBMOffset);
ab.nID = IDB_VIEW_SMALL_COLOR; // std view bitmaps ab.nID = IDB_VIEW_SMALL_COLOR; /* std view bitmaps */
IShellBrowser_SendControlMsg(this->pShellBrowser,FCW_TOOLBAR, IShellBrowser_SendControlMsg(this->pShellBrowser,FCW_TOOLBAR,
TB_ADDBITMAP, 8, (LPARAM)&ab, &iViewBMOffset); TB_ADDBITMAP, 8, (LPARAM)&ab, &iViewBMOffset);
...@@ -272,7 +272,7 @@ BOOL32 ShellView_CreateList (LPSHELLVIEW this) ...@@ -272,7 +272,7 @@ BOOL32 ShellView_CreateList (LPSHELLVIEW this)
if(!this->hWndList) if(!this->hWndList)
return FALSE; return FALSE;
// UpdateShellSettings(); /* UpdateShellSettings(); */
return TRUE; return TRUE;
} }
/************************************************************************** /**************************************************************************
...@@ -294,7 +294,7 @@ BOOL32 ShellView_InitList(LPSHELLVIEW this) ...@@ -294,7 +294,7 @@ BOOL32 ShellView_InitList(LPSHELLVIEW this)
ListView_DeleteAllItems(this->hWndList); ListView_DeleteAllItems(this->hWndList);
//initialize the columns /*initialize the columns */
lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; /* | LVCF_SUBITEM;*/ lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; /* | LVCF_SUBITEM;*/
lvColumn.fmt = LVCFMT_LEFT; lvColumn.fmt = LVCFMT_LEFT;
lvColumn.pszText = szString; lvColumn.pszText = szString;
...@@ -565,16 +565,16 @@ LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT32 uState) ...@@ -565,16 +565,16 @@ LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT32 uState)
TRACE(shell,"%p uState=%x\n",this,uState); TRACE(shell,"%p uState=%x\n",this,uState);
//don't do anything if the state isn't really changing /*don't do anything if the state isn't really changing */
if(this->uState == uState) if(this->uState == uState)
{ return S_OK; { return S_OK;
} }
ShellView_OnDeactivate(this); ShellView_OnDeactivate(this);
//only do this if we are active /*only do this if we are active */
if(uState != SVUIA_DEACTIVATE) if(uState != SVUIA_DEACTIVATE)
{ //merge the menus { /*merge the menus */
this->hMenu = CreateMenu32(); this->hMenu = CreateMenu32();
if(this->hMenu) if(this->hMenu)
...@@ -607,7 +607,7 @@ LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT32 uState) ...@@ -607,7 +607,7 @@ LRESULT ShellView_OnActivate(LPSHELLVIEW this, UINT32 uState)
/*add the items that should only be added if we have the focus*/ /*add the items that should only be added if we have the focus*/
if(SVUIA_ACTIVATE_FOCUS == uState) if(SVUIA_ACTIVATE_FOCUS == uState)
{ //get the file menu so we can merge with it { /*get the file menu so we can merge with it */
ZeroMemory(&mii, sizeof(mii)); ZeroMemory(&mii, sizeof(mii));
mii.cbSize = sizeof(mii); mii.cbSize = sizeof(mii);
mii.fMask = MIIM_SUBMENU; mii.fMask = MIIM_SUBMENU;
...@@ -671,34 +671,38 @@ BOOL32 ShellView_AddRemoveDockingWindow(LPSHELLVIEW this, BOOL32 bAdd) ...@@ -671,34 +671,38 @@ BOOL32 ShellView_AddRemoveDockingWindow(LPSHELLVIEW this, BOOL32 bAdd)
{ if(bAdd) { if(bAdd)
{ hr = S_OK; { hr = S_OK;
FIXME(shell,"no docking implemented\n"); FIXME(shell,"no docking implemented\n");
/*if(!this->pDockingWindow) #if 0
{ //create the toolbar object if(!this->pDockingWindow)
{ /* create the toolbar object */
this->pDockingWindow = DockingWindow_Constructor(this, this->hWnd); this->pDockingWindow = DockingWindow_Constructor(this, this->hWnd);
} }
if(this->pDockingWindow) if(this->pDockingWindow)
{ //add the toolbar object { /*add the toolbar object */
hr = pFrame->lpvtbl->fnAddToolbar(pFrame, (IDockingWindow*)this->pDockingWindow, TOOLBAR_ID, 0); hr = pFrame->lpvtbl->fnAddToolbar(pFrame, (IDockingWindow*)this->pDockingWindow, TOOLBAR_ID, 0);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ bReturn = TRUE; { bReturn = TRUE;
} }
}*/ }
#endif
} }
else else
{ FIXME(shell,"no docking implemented\n"); { FIXME(shell,"no docking implemented\n");
/* if(this->pDockingWindow) #if 0
if(this->pDockingWindow)
{ hr = pFrame->lpvtbl->fnRemoveToolbar(pFrame, (IDockingWindow*)this->pDockingWindow, DWFRF_NORMAL); { hr = pFrame->lpvtbl->fnRemoveToolbar(pFrame, (IDockingWindow*)this->pDockingWindow, DWFRF_NORMAL);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ // RemoveToolbar should release the toolbar object which will cause { /* RemoveToolbar should release the toolbar object which will cause */
//it to destroy itself. Our toolbar object is no longer valid at /*it to destroy itself. Our toolbar object is no longer valid at */
//this point. /*this point. */
this->pDockingWindow = NULL; this->pDockingWindow = NULL;
bReturn = TRUE; bReturn = TRUE;
} }
}*/ }
#endif
} }
pFrame->lpvtbl->fnRelease(pFrame); pFrame->lpvtbl->fnRelease(pFrame);
} }
...@@ -777,7 +781,7 @@ void ShellView_UpdateShellSettings(LPSHELLVIEW this) ...@@ -777,7 +781,7 @@ void ShellView_UpdateShellSettings(LPSHELLVIEW this)
*/ */
LRESULT ShellView_OnSettingChange(LPSHELLVIEW this, LPCSTR lpszSection) LRESULT ShellView_OnSettingChange(LPSHELLVIEW this, LPCSTR lpszSection)
{ TRACE(shell,"(%p) stub\n",this); { TRACE(shell,"(%p) stub\n",this);
//if(0 == lstrcmpi(lpszSection, "ShellState")) /*if(0 == lstrcmpi(lpszSection, "ShellState"))*/
{ ShellView_UpdateShellSettings(this); { ShellView_UpdateShellSettings(this);
return 0; return 0;
} }
...@@ -1382,7 +1386,7 @@ static HRESULT WINAPI IShellView_UIActivate(LPSHELLVIEW this,UINT32 uState) ...@@ -1382,7 +1386,7 @@ static HRESULT WINAPI IShellView_UIActivate(LPSHELLVIEW this,UINT32 uState)
/*only do this if we are active*/ /*only do this if we are active*/
if(uState != SVUIA_DEACTIVATE) if(uState != SVUIA_DEACTIVATE)
{ //update the status bar { /*update the status bar */
strcpy(szName, "dummy32"); strcpy(szName, "dummy32");
this->pSFParent->lpvtbl->fnGetFolderPath( this->pSFParent, this->pSFParent->lpvtbl->fnGetFolderPath( this->pSFParent,
...@@ -1397,7 +1401,7 @@ static HRESULT WINAPI IShellView_UIActivate(LPSHELLVIEW this,UINT32 uState) ...@@ -1397,7 +1401,7 @@ static HRESULT WINAPI IShellView_UIActivate(LPSHELLVIEW this,UINT32 uState)
IShellBrowser_SendControlMsg(this->pShellBrowser, FCW_STATUS, SB_SETTEXT32A, IShellBrowser_SendControlMsg(this->pShellBrowser, FCW_STATUS, SB_SETTEXT32A,
0, (LPARAM)szName, &lResult); 0, (LPARAM)szName, &lResult);
//add the docking window if necessary /*add the docking window if necessary */
if(g_bShowIDW) if(g_bShowIDW)
{ ShellView_AddRemoveDockingWindow(this, TRUE); { ShellView_AddRemoveDockingWindow(this, TRUE);
} }
......
files/profile.c
View file @ 73458b03
...@@ -708,10 +708,10 @@ int PROFILE_GetWineIniInt( const char *section, const char *key_name, int def ) ...@@ -708,10 +708,10 @@ int PROFILE_GetWineIniInt( const char *section, const char *key_name, int def )
/****************************************************************************** /******************************************************************************
* *
* int PROFILE_EnumerateWineIniSection( * int PROFILE_EnumerateWineIniSection(
* char const *section, // Name of the section to enumerate * char const *section, #Name of the section to enumerate
* void (*cbfn)(char const *key, char const *value, void *user), * void (*cbfn)(char const *key, char const *value, void *user),
// Address of the callback function * # Address of the callback function
* void *user ) // User-specified pointer. * void *user ) # User-specified pointer.
* *
* For each entry in a section in the wine.conf file, this function will * For each entry in a section in the wine.conf file, this function will
* call the specified callback function, informing it of each key and * call the specified callback function, informing it of each key and
......
graphics/path.c
View file @ 73458b03
...@@ -676,8 +676,8 @@ BOOL32 PATH_Rectangle(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2) ...@@ -676,8 +676,8 @@ BOOL32 PATH_Rectangle(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2)
*/ */
BOOL32 PATH_Ellipse(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2) BOOL32 PATH_Ellipse(HDC32 hdc, INT32 x1, INT32 y1, INT32 x2, INT32 y2)
{ {
// TODO: This should probably be revised to call PATH_AngleArc /* TODO: This should probably be revised to call PATH_AngleArc */
// (once it exists) /* (once it exists) */
return PATH_Arc(hdc, x1, y1, x2, y2, x1, (y1+y2)/2, x1, (y1+y2)/2); return PATH_Arc(hdc, x1, y1, x2, y2, x1, (y1+y2)/2, x1, (y1+y2)/2);
} }
......
include/commctrl.h
View file @ 73458b03
...@@ -2282,10 +2282,10 @@ typedef INT32 (CALLBACK *PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM); ...@@ -2282,10 +2282,10 @@ typedef INT32 (CALLBACK *PFNLVCOMPARE)(LPARAM, LPARAM, LPARAM);
#define WC_TABCONTROL WINELIB_NAME_AW(WC_TABCONTROL) #define WC_TABCONTROL WINELIB_NAME_AW(WC_TABCONTROL)
/* tab control styles */ /* tab control styles */
#define TCS_SCROLLOPPOSITE 0x0001 // assumes multiline tab #define TCS_SCROLLOPPOSITE 0x0001 /* assumes multiline tab */
#define TCS_BOTTOM 0x0002 #define TCS_BOTTOM 0x0002
#define TCS_RIGHT 0x0002 #define TCS_RIGHT 0x0002
#define TCS_MULTISELECT 0x0004 // allow multi-select in button mode #define TCS_MULTISELECT 0x0004 /* allow multi-select in button mode */
#define TCS_FORCEICONLEFT 0x0010 #define TCS_FORCEICONLEFT 0x0010
#define TCS_FORCELABELLEFT 0x0020 #define TCS_FORCELABELLEFT 0x0020
#define TCS_HOTTRACK 0x0040 #define TCS_HOTTRACK 0x0040
...@@ -2851,10 +2851,10 @@ DECL_WINELIB_TYPE(PFNPROPSHEETCALLBACK) ...@@ -2851,10 +2851,10 @@ DECL_WINELIB_TYPE(PFNPROPSHEETCALLBACK)
#define PSN_SETACTIVE (PSN_FIRST-0) #define PSN_SETACTIVE (PSN_FIRST-0)
#define PSN_KILLACTIVE (PSN_FIRST-1) #define PSN_KILLACTIVE (PSN_FIRST-1)
// #define PSN_VALIDATE (PSN_FIRST-1) /* #define PSN_VALIDATE (PSN_FIRST-1) */
#define PSN_APPLY (PSN_FIRST-2) #define PSN_APPLY (PSN_FIRST-2)
#define PSN_RESET (PSN_FIRST-3) #define PSN_RESET (PSN_FIRST-3)
// #define PSN_CANCEL (PSN_FIRST-3) /* #define PSN_CANCEL (PSN_FIRST-3) */
#define PSN_HELP (PSN_FIRST-5) #define PSN_HELP (PSN_FIRST-5)
#define PSN_WIZBACK (PSN_FIRST-6) #define PSN_WIZBACK (PSN_FIRST-6)
#define PSN_WIZNEXT (PSN_FIRST-7) #define PSN_WIZNEXT (PSN_FIRST-7)
......
include/d3d.h
View file @ 73458b03
...@@ -280,7 +280,7 @@ typedef float D3DVALUE,*LPD3DVALUE; ...@@ -280,7 +280,7 @@ typedef float D3DVALUE,*LPD3DVALUE;
#define D3DMultiply(a, b) ((a) * (b)) #define D3DMultiply(a, b) ((a) * (b))
#if 0 #if 0
// This causes lots o' problems /* This causes lots o' problems */
typedef struct { typedef struct {
union { union {
D3DVALUE x; D3DVALUE x;
......
include/dplay.h
View file @ 73458b03
...@@ -75,7 +75,7 @@ DEFINE_GUID(IID_IDirectPlay2A,0x9d460580, 0xa822, 0x11cf, 0x96, 0xc, 0x0, 0x80, ...@@ -75,7 +75,7 @@ DEFINE_GUID(IID_IDirectPlay2A,0x9d460580, 0xa822, 0x11cf, 0x96, 0xc, 0x0, 0x80,
DEFINE_GUID(IID_IDirectPlay3, 0x133efe40, 0x32dc, 0x11d0, 0x9c, 0xfb, 0x0, 0xa0, 0xc9, 0xa, 0x43, 0xcb); DEFINE_GUID(IID_IDirectPlay3, 0x133efe40, 0x32dc, 0x11d0, 0x9c, 0xfb, 0x0, 0xa0, 0xc9, 0xa, 0x43, 0xcb);
DEFINE_GUID(IID_IDirectPlay3A,0x133efe41, 0x32dc, 0x11d0, 0x9c, 0xfb, 0x0, 0xa0, 0xc9, 0xa, 0x43, 0xcb); DEFINE_GUID(IID_IDirectPlay3A,0x133efe41, 0x32dc, 0x11d0, 0x9c, 0xfb, 0x0, 0xa0, 0xc9, 0xa, 0x43, 0xcb);
// {D1EB6D20-8923-11d0-9D97-00A0C90A43CB} /* {D1EB6D20-8923-11d0-9D97-00A0C90A43CB} */
DEFINE_GUID(CLSID_DirectPlay,0xd1eb6d20, 0x8923, 0x11d0, 0x9d, 0x97, 0x0, 0xa0, 0xc9, 0xa, 0x43, 0xcb); DEFINE_GUID(CLSID_DirectPlay,0xd1eb6d20, 0x8923, 0x11d0, 0x9d, 0x97, 0x0, 0xa0, 0xc9, 0xa, 0x43, 0xcb);
...@@ -281,50 +281,50 @@ typedef struct tagDPCHAT ...@@ -281,50 +281,50 @@ typedef struct tagDPCHAT
DWORD dwSize; DWORD dwSize;
DWORD dwFlags; DWORD dwFlags;
union union
{ // Message string { /* Message string */
LPWSTR lpszMessage; // Unicode LPWSTR lpszMessage; /* Unicode */
LPSTR lpszMessageA; // ANSI LPSTR lpszMessageA; /* ANSI */
}msgstr; }msgstr;
} DPCHAT, *LPDPCHAT; } DPCHAT, *LPDPCHAT;
typedef struct tagDPSECURITYDESC typedef struct tagDPSECURITYDESC
{ {
DWORD dwSize; // Size of structure DWORD dwSize; /* Size of structure */
DWORD dwFlags; // Not used. Must be zero. DWORD dwFlags; /* Not used. Must be zero. */
union union
{ // SSPI provider name { /* SSPI provider name */
LPWSTR lpszSSPIProvider; // Unicode LPWSTR lpszSSPIProvider; /* Unicode */
LPSTR lpszSSPIProviderA; // ANSI LPSTR lpszSSPIProviderA; /* ANSI */
}sspi; }sspi;
union union
{ // CAPI provider name { /* CAPI provider name */
LPWSTR lpszCAPIProvider; // Unicode LPWSTR lpszCAPIProvider; /* Unicode */
LPSTR lpszCAPIProviderA; // ANSI LPSTR lpszCAPIProviderA; /* ANSI */
}capi; }capi;
DWORD dwCAPIProviderType; // Crypto Service Provider type DWORD dwCAPIProviderType; /* Crypto Service Provider type */
DWORD dwEncryptionAlgorithm; // Encryption Algorithm type DWORD dwEncryptionAlgorithm; /* Encryption Algorithm type */
} DPSECURITYDESC, *LPDPSECURITYDESC; } DPSECURITYDESC, *LPDPSECURITYDESC;
typedef const DPSECURITYDESC *LPCDPSECURITYDESC; typedef const DPSECURITYDESC *LPCDPSECURITYDESC;
typedef struct tagDPCREDENTIALS typedef struct tagDPCREDENTIALS
{ {
DWORD dwSize; // Size of structure DWORD dwSize; /* Size of structure */
DWORD dwFlags; // Not used. Must be zero. DWORD dwFlags; /* Not used. Must be zero. */
union union
{ // User name of the account { /* User name of the account */
LPWSTR lpszUsername; // Unicode LPWSTR lpszUsername; /* Unicode */
LPSTR lpszUsernameA; // ANSI LPSTR lpszUsernameA; /* ANSI */
}name; }name;
union union
{ // Password of the account { /* Password of the account */
LPWSTR lpszPassword; // Unicode LPWSTR lpszPassword; /* Unicode */
LPSTR lpszPasswordA; // ANSI LPSTR lpszPasswordA; /* ANSI */
}pass; }pass;
union union
{ // Domain name of the account { /* Domain name of the account */
LPWSTR lpszDomain; // Unicode LPWSTR lpszDomain; /* Unicode */
LPSTR lpszDomainA; // ANSI LPSTR lpszDomainA; /* ANSI */
}domain; }domain;
} DPCREDENTIALS, *LPDPCREDENTIALS; } DPCREDENTIALS, *LPDPCREDENTIALS;
......
include/dsound.h
View file @ 73458b03
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "winbase.h" #include "winbase.h"
#include "compobj.h" #include "compobj.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "d3d.h" //FIXME: Need to break out d3dtypes.h #include "d3d.h" /*FIXME: Need to break out d3dtypes.h */
DEFINE_GUID(CLSID_DirectSound, 0x47d4d946, 0x62e8, 0x11cf, 0x93, 0xbc, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0); DEFINE_GUID(CLSID_DirectSound, 0x47d4d946, 0x62e8, 0x11cf, 0x93, 0xbc, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0);
...@@ -162,10 +162,10 @@ typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY; ...@@ -162,10 +162,10 @@ typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY;
#define DSSPEAKER_STEREO 4 #define DSSPEAKER_STEREO 4
#define DSSPEAKER_SURROUND 5 #define DSSPEAKER_SURROUND 5
#define DSSPEAKER_GEOMETRY_MIN 0x00000005 // 5 degrees #define DSSPEAKER_GEOMETRY_MIN 0x00000005 /* 5 degrees */
#define DSSPEAKER_GEOMETRY_NARROW 0x0000000A // 10 degrees #define DSSPEAKER_GEOMETRY_NARROW 0x0000000A /* 10 degrees */
#define DSSPEAKER_GEOMETRY_WIDE 0x00000014 // 20 degrees #define DSSPEAKER_GEOMETRY_WIDE 0x00000014 /* 20 degrees */
#define DSSPEAKER_GEOMETRY_MAX 0x000000B4 // 180 degrees #define DSSPEAKER_GEOMETRY_MAX 0x000000B4 /* 180 degrees */
typedef LPVOID* LPLPVOID; typedef LPVOID* LPLPVOID;
...@@ -328,12 +328,12 @@ typedef const DS3DLISTENER *LPCDS3DLISTENER; ...@@ -328,12 +328,12 @@ typedef const DS3DLISTENER *LPCDS3DLISTENER;
#define THIS LPDIRECTSOUND3DLISTENER this #define THIS LPDIRECTSOUND3DLISTENER this
typedef struct IDirectSound3DListener_VTable typedef struct IDirectSound3DListener_VTable
{ {
// IUnknown methods /* IUnknown methods */
STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// IDirectSound3DListener methods /* IDirectSound3DListener methods */
STDMETHOD(GetAllParameters) (THIS_ LPDS3DLISTENER) PURE; STDMETHOD(GetAllParameters) (THIS_ LPDS3DLISTENER) PURE;
STDMETHOD(GetDistanceFactor) (THIS_ LPD3DVALUE) PURE; STDMETHOD(GetDistanceFactor) (THIS_ LPD3DVALUE) PURE;
STDMETHOD(GetDopplerFactor) (THIS_ LPD3DVALUE) PURE; STDMETHOD(GetDopplerFactor) (THIS_ LPD3DVALUE) PURE;
...@@ -378,12 +378,12 @@ typedef const DS3DBUFFER *LPCDS3DBUFFER; ...@@ -378,12 +378,12 @@ typedef const DS3DBUFFER *LPCDS3DBUFFER;
#define THIS LPDIRECTSOUND3DBUFFER this #define THIS LPDIRECTSOUND3DBUFFER this
typedef struct IDirectSound3DBuffer_VTable typedef struct IDirectSound3DBuffer_VTable
{ {
// IUnknown methods /* IUnknown methods */
STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// IDirectSound3DBuffer methods /* IDirectSound3DBuffer methods */
STDMETHOD(GetAllParameters) (THIS_ LPDS3DBUFFER) PURE; STDMETHOD(GetAllParameters) (THIS_ LPDS3DBUFFER) PURE;
STDMETHOD(GetConeAngles) (THIS_ LPDWORD, LPDWORD) PURE; STDMETHOD(GetConeAngles) (THIS_ LPDWORD, LPDWORD) PURE;
STDMETHOD(GetConeOrientation) (THIS_ LPD3DVECTOR) PURE; STDMETHOD(GetConeOrientation) (THIS_ LPD3DVECTOR) PURE;
......
include/ole.h
View file @ 73458b03
...@@ -32,7 +32,7 @@ typedef enum tagCLSCTX ...@@ -32,7 +32,7 @@ typedef enum tagCLSCTX
CLSCTX_INPROC_SERVER = 0x1, CLSCTX_INPROC_SERVER = 0x1,
CLSCTX_INPROC_HANDLER = 0x2, CLSCTX_INPROC_HANDLER = 0x2,
CLSCTX_LOCAL_SERVER = 0x4, CLSCTX_LOCAL_SERVER = 0x4,
CLSCTX_REMOTE_SERVER = 0x10, CLSCTX_REMOTE_SERVER = 0x10
} CLSCTX; } CLSCTX;
#define CLSCTX_SERVER (CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER) #define CLSCTX_SERVER (CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER)
......
include/oleobj.h
View file @ 73458b03
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "ole.h" #include "ole.h"
#include "ole2.h" #include "ole2.h"
#include "compobj.h" #include "compobj.h"
// #include "interfaces.h" /* #include "interfaces.h" */
#define STDMETHOD(xfn) HRESULT (CALLBACK *fn##xfn) #define STDMETHOD(xfn) HRESULT (CALLBACK *fn##xfn)
#define STDMETHOD_(type,xfn) type (CALLBACK *fn##xfn) #define STDMETHOD_(type,xfn) type (CALLBACK *fn##xfn)
......
include/vfw.h
View file @ 73458b03
...@@ -242,9 +242,9 @@ typedef struct { ...@@ -242,9 +242,9 @@ typedef struct {
INT32 dySrc; INT32 dySrc;
} ICDECOMPRESSEX; } ICDECOMPRESSEX;
#define ICDRAW_QUERY 0x00000001L // test for support #define ICDRAW_QUERY 0x00000001L /* test for support */
#define ICDRAW_FULLSCREEN 0x00000002L // draw to full screen #define ICDRAW_FULLSCREEN 0x00000002L /* draw to full screen */
#define ICDRAW_HDC 0x00000004L // draw to a HDC/HWND #define ICDRAW_HDC 0x00000004L /* draw to a HDC/HWND */
BOOL32 VFWAPI ICInfo32(DWORD fccType, DWORD fccHandler, ICINFO32 * lpicinfo); BOOL32 VFWAPI ICInfo32(DWORD fccType, DWORD fccHandler, ICINFO32 * lpicinfo);
......
include/winerror.h
View file @ 73458b03
...@@ -183,10 +183,10 @@ extern int WIN32_LastError; ...@@ -183,10 +183,10 @@ extern int WIN32_LastError;
#define E_OUTOFMEMORY 0x8007000E #define E_OUTOFMEMORY 0x8007000E
#define E_INVALIDARG 0x80070057 #define E_INVALIDARG 0x80070057
//#define OLE_E_FIRST 0x80040000L /*#define OLE_E_FIRST 0x80040000L */
//#define OLE_E_LAST 0x800400FFL /*#define OLE_E_LAST 0x800400FFL */
//#define OLE_S_FIRST 0x00040000L /*#define OLE_S_FIRST 0x00040000L */
//#define OLE_S_LAST 0x000400FFL /*#define OLE_S_LAST 0x000400FFL */
#define STG_E_INVALIDFUNCTION 0x80030001 #define STG_E_INVALIDFUNCTION 0x80030001
#define STG_E_FILENOTFOUND 0x80030002 #define STG_E_FILENOTFOUND 0x80030002
......
include/winioctl.h
View file @ 73458b03
...@@ -199,21 +199,21 @@ ...@@ -199,21 +199,21 @@
/* Return Codes... should these be the same as something somewhere? */ /* Return Codes... should these be the same as something somewhere? */
#define PARTITION_ENTRY_UNUSED 0x00 // Entry unused #define PARTITION_ENTRY_UNUSED 0x00 /* Entry unused */
#define PARTITION_FAT_12 0x01 // 12-bit FAT entries #define PARTITION_FAT_12 0x01 /* 12-bit FAT entries */
#define PARTITION_XENIX_1 0x02 // Xenix #define PARTITION_XENIX_1 0x02 /* Xenix */
#define PARTITION_XENIX_2 0x03 // Xenix #define PARTITION_XENIX_2 0x03 /* Xenix */
#define PARTITION_FAT_16 0x04 // 16-bit FAT entries #define PARTITION_FAT_16 0x04 /* 16-bit FAT entries */
#define PARTITION_EXTENDED 0x05 // Extended partition entry #define PARTITION_EXTENDED 0x05 /* Extended partition entry */
#define PARTITION_HUGE 0x06 // Huge partition MS-DOS V4 #define PARTITION_HUGE 0x06 /* Huge partition MS-DOS V4 */
#define PARTITION_IFS 0x07 // IFS Partition #define PARTITION_IFS 0x07 /* IFS Partition */
#define PARTITION_FAT32 0x0B // FAT32 #define PARTITION_FAT32 0x0B /* FAT32 */
#define PARTITION_FAT32_XINT13 0x0C // FAT32 using extended int13 services #define PARTITION_FAT32_XINT13 0x0C /* FAT32 using extended int13 services */
#define PARTITION_XINT13 0x0E // Win95 partition using extended int13 services #define PARTITION_XINT13 0x0E /* Win95 partition using extended int13 services */
#define PARTITION_XINT13_EXTENDED 0x0F // Same as type 5 but uses extended int13 services #define PARTITION_XINT13_EXTENDED 0x0F /* Same as type 5 but uses extended int13 services */
#define PARTITION_PREP 0x41 // PowerPC Reference Platform (PReP) Boot Partition #define PARTITION_PREP 0x41 /* PowerPC Reference Platform (PReP) Boot Partition */
#define PARTITION_LDM 0x42 // Logical Disk Manager partition #define PARTITION_LDM 0x42 /* Logical Disk Manager partition */
#define PARTITION_UNIX 0x63 // Unix #define PARTITION_UNIX 0x63 /* Unix */
/* Device Io Stuff - Most VxD support. /* Device Io Stuff - Most VxD support.
......
misc/main.c
View file @ 73458b03
...@@ -623,17 +623,17 @@ int MAIN_GetLanguageID(LPCSTR Lang,LPCSTR Country,LPCSTR Charset,LPCSTR Dialect) ...@@ -623,17 +623,17 @@ int MAIN_GetLanguageID(LPCSTR Lang,LPCSTR Country,LPCSTR Charset,LPCSTR Dialect)
/*x3c*/ LANG_ENTRY_BEGIN( "gd", GAELIC ) /*x3c*/ LANG_ENTRY_BEGIN( "gd", GAELIC )
LANG_DIALECT_ENTRY( GAELIC, GAELIC_SCOTTISH ) LANG_DIALECT_ENTRY( GAELIC, GAELIC_SCOTTISH )
LANG_ENTRY_END( GAELIC ) LANG_ENTRY_END( GAELIC )
// 0x3d /* 0x3d */
/*x3e*/ LANG_ENTRY_BEGIN( "ms", MALAY ) /*x3e*/ LANG_ENTRY_BEGIN( "ms", MALAY )
LANG_SUB_ENTRY( "MY", MALAY, MALAY ) LANG_SUB_ENTRY( "MY", MALAY, MALAY )
LANG_SUB_ENTRY( "BN", MALAY, MALAY_BRUNEI_DARUSSALAM ) LANG_SUB_ENTRY( "BN", MALAY, MALAY_BRUNEI_DARUSSALAM )
LANG_ENTRY_END( MALAY ) LANG_ENTRY_END( MALAY )
/*x3f*/ LANG_ENTRY_BEGIN( "kk", KAZAKH ) /*x3f*/ LANG_ENTRY_BEGIN( "kk", KAZAKH )
LANG_ENTRY_END( KAZAKH ) LANG_ENTRY_END( KAZAKH )
// 0x40 /* 0x40 */
/*x41*/ LANG_ENTRY_BEGIN( "sw", SWAHILI ) /*x41*/ LANG_ENTRY_BEGIN( "sw", SWAHILI )
LANG_ENTRY_END( SWAHILI ) LANG_ENTRY_END( SWAHILI )
// 0x42 /* 0x42 */
/*x43*/ LANG_ENTRY_BEGIN( "uz", UZBEK ) /*x43*/ LANG_ENTRY_BEGIN( "uz", UZBEK )
/* Cyrillic */ /* Cyrillic */
if (strstr(charset,"KOI8") || !strcmp(charset,"ISO-8859-5")) if (strstr(charset,"KOI8") || !strcmp(charset,"ISO-8859-5"))
...@@ -665,10 +665,10 @@ int MAIN_GetLanguageID(LPCSTR Lang,LPCSTR Country,LPCSTR Charset,LPCSTR Dialect) ...@@ -665,10 +665,10 @@ int MAIN_GetLanguageID(LPCSTR Lang,LPCSTR Country,LPCSTR Charset,LPCSTR Dialect)
LANG_ENTRY_END( MARATHI ) LANG_ENTRY_END( MARATHI )
/*x4f*/ LANG_ENTRY_BEGIN( "sa", SANSKRIT ) /*x4f*/ LANG_ENTRY_BEGIN( "sa", SANSKRIT )
LANG_ENTRY_END( SANSKRIT ) LANG_ENTRY_END( SANSKRIT )
// 0x50 -> 0x56 /* 0x50 -> 0x56 */
/*x57*/ /*LANG_ENTRY_BEGIN( "??", KONKANI ) /*x57*/ /*LANG_ENTRY_BEGIN( "??", KONKANI )
LANG_ENTRY_END( KONKANI ) */ LANG_ENTRY_END( KONKANI ) */
// 0x58 -> ... /* 0x58 -> ... */
LANG_ENTRY_BEGIN( "eo", ESPERANTO ) /* not official */ LANG_ENTRY_BEGIN( "eo", ESPERANTO ) /* not official */
LANG_ENTRY_END( ESPERANTO ) LANG_ENTRY_END( ESPERANTO )
......
multimedia/audio.c
View file @ 73458b03
...@@ -480,7 +480,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME16 lpTime, DWORD uSize) ...@@ -480,7 +480,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME16 lpTime, DWORD uSize)
time -= lpTime->u.smpte.sec * 30; time -= lpTime->u.smpte.sec * 30;
lpTime->u.smpte.frame = time; lpTime->u.smpte.frame = time;
lpTime->u.smpte.fps = 30; lpTime->u.smpte.fps = 30;
TRACE(wave, "wodGetPosition // TIME_SMPTE=%02u:%02u:%02u:%02u\n", TRACE(wave, "wodGetPosition , TIME_SMPTE=%02u:%02u:%02u:%02u\n",
lpTime->u.smpte.hour, lpTime->u.smpte.min, lpTime->u.smpte.hour, lpTime->u.smpte.min,
lpTime->u.smpte.sec, lpTime->u.smpte.frame); lpTime->u.smpte.sec, lpTime->u.smpte.frame);
break; break;
...@@ -490,7 +490,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME16 lpTime, DWORD uSize) ...@@ -490,7 +490,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME16 lpTime, DWORD uSize)
case TIME_MS: case TIME_MS:
lpTime->u.ms = WOutDev[wDevID].dwTotalPlayed / lpTime->u.ms = WOutDev[wDevID].dwTotalPlayed /
(WOutDev[wDevID].Format.wf.nAvgBytesPerSec / 1000); (WOutDev[wDevID].Format.wf.nAvgBytesPerSec / 1000);
TRACE(wave,"wodGetPosition // TIME_MS=%lu\n", lpTime->u.ms); TRACE(wave,"wodGetPosition , TIME_MS=%lu\n", lpTime->u.ms);
break; break;
} }
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
......
ole/ole2.c
View file @ 73458b03
...@@ -164,6 +164,6 @@ HRESULT WINAPI CreateBindCtx32 (DWORD reserved, LPVOID *ppbc) ...@@ -164,6 +164,6 @@ HRESULT WINAPI CreateBindCtx32 (DWORD reserved, LPVOID *ppbc)
{ {
FIXME(ole,"(0x%08lx %p): stub!\n", reserved, ppbc); FIXME(ole,"(0x%08lx %p): stub!\n", reserved, ppbc);
*ppbc = 0; *ppbc = 0;
// return S_OK; /* return S_OK; */
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
programs/clock/language.c
View file @ 73458b03
...@@ -189,7 +189,7 @@ VOID LANGUAGE_Init(VOID) ...@@ -189,7 +189,7 @@ VOID LANGUAGE_Init(VOID)
sizeof(szBuffer)); sizeof(szBuffer));
Globals.lpszLanguage = LocalLock(LocalAlloc(LMEM_FIXED, lstrlen(szBuffer))); Globals.lpszLanguage = LocalLock(LocalAlloc(LMEM_FIXED, lstrlen(szBuffer)));
// hmemcpy(Globals.lpszLanguage, szBuffer, 1+lstrlen(szBuffer)); /* hmemcpy(Globals.lpszLanguage, szBuffer, 1+lstrlen(szBuffer)); */
lstrcpyn(Globals.lpszLanguage, szBuffer, strlen(szBuffer)+1); lstrcpyn(Globals.lpszLanguage, szBuffer, strlen(szBuffer)+1);
} }
} }
......
programs/clock/main.c
View file @ 73458b03
...@@ -93,7 +93,7 @@ int CLOCK_MenuCommand (WPARAM wParam) ...@@ -93,7 +93,7 @@ int CLOCK_MenuCommand (WPARAM wParam)
ShellAbout(Globals.hMainWnd, "Clock", "Clock\n" WINE_RELEASE_INFO, 0); ShellAbout(Globals.hMainWnd, "Clock", "Clock\n" WINE_RELEASE_INFO, 0);
break; break;
} }
// Handle languages /* Handle languages */
default: default:
LANGUAGE_DefaultHandle(wParam); LANGUAGE_DefaultHandle(wParam);
} }
...@@ -115,7 +115,7 @@ VOID MAIN_FileChooseFont(VOID) { ...@@ -115,7 +115,7 @@ VOID MAIN_FileChooseFont(VOID) {
font.lpfnHook = 0; font.lpfnHook = 0;
font.lpTemplateName = 0; font.lpTemplateName = 0;
font.hInstance = Globals.hInstance; font.hInstance = Globals.hInstance;
// font.lpszStyle = LF_FACESIZE; /* font.lpszStyle = LF_FACESIZE; */
font.nFontType = 0; font.nFontType = 0;
font.nSizeMin = 0; font.nSizeMin = 0;
font.nSizeMax = 144; font.nSizeMax = 144;
...@@ -273,7 +273,7 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show) ...@@ -273,7 +273,7 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show)
else Idle(NULL); else Idle(NULL);
} }
// We will never reach the following statement ! /* We will never reach the following statement ! */
return 0; return 0;
} }
programs/notepad/dialog.c
View file @ 73458b03
...@@ -73,15 +73,15 @@ BOOL ExistFile(LPCSTR szFilename) { ...@@ -73,15 +73,15 @@ BOOL ExistFile(LPCSTR szFilename) {
} }
VOID DoSaveFile(VOID) { VOID DoSaveFile(VOID) {
// Really Save the file /* Really Save the file */
// ... (Globals.szFileName); /* ... (Globals.szFileName); */
} }
BOOL DoCloseFile(void) { BOOL DoCloseFile(void) {
// Return value: TRUE - User agreed to close (both save/don't save) /* Return value: TRUE - User agreed to close (both save/don't save) */
// FALSE - User cancelled close by selecting "Cancel" /* FALSE - User cancelled close by selecting "Cancel" */
CHAR szMessage[MAX_STRING_LEN]; CHAR szMessage[MAX_STRING_LEN];
CHAR szCaption[MAX_STRING_LEN]; CHAR szCaption[MAX_STRING_LEN];
...@@ -90,16 +90,16 @@ BOOL DoCloseFile(void) { ...@@ -90,16 +90,16 @@ BOOL DoCloseFile(void) {
if (strlen(Globals.szFileName)>0) { if (strlen(Globals.szFileName)>0) {
// prompt user to save changes /* prompt user to save changes */
// FIXME: The following resources are not yet in the .rc files /* FIXME: The following resources are not yet in the .rc files */
// szMessage, szCaption show up random values. Please keep these lines! /* szMessage, szCaption show up random values. Please keep these lines! */
strcpy(szMessage, "Save changes ?"); strcpy(szMessage, "Save changes ?");
strcpy(szCaption, "Save changes"); strcpy(szCaption, "Save changes");
// LoadString(Globals.hInstance, ids_savechanges, szMessage, sizeof(szMessage)); /* LoadString(Globals.hInstance, ids_savechanges, szMessage, sizeof(szMessage)); */
// LoadString(Globals.hInstance, ids_savetitle, szCaption, sizeof(szCaption)); /* LoadString(Globals.hInstance, ids_savetitle, szCaption, sizeof(szCaption)); */
nResult = MessageBox(Globals.hMainWnd, szMessage, szCaption, MB_YESNOCANCEL); nResult = MessageBox(Globals.hMainWnd, szMessage, szCaption, MB_YESNOCANCEL);
...@@ -119,7 +119,7 @@ BOOL DoCloseFile(void) { ...@@ -119,7 +119,7 @@ BOOL DoCloseFile(void) {
} }
// Forget file name /* Forget file name */
lstrcpy(Globals.szFileName, ""); lstrcpy(Globals.szFileName, "");
LANGUAGE_UpdateWindowCaption(); LANGUAGE_UpdateWindowCaption();
...@@ -130,10 +130,10 @@ BOOL DoCloseFile(void) { ...@@ -130,10 +130,10 @@ BOOL DoCloseFile(void) {
void DoOpenFile(LPCSTR szFileName) { void DoOpenFile(LPCSTR szFileName) {
// Close any files and prompt to save changes /* Close any files and prompt to save changes */
if (DoCloseFile) { if (DoCloseFile) {
// Open file /* Open file */
lstrcpy(Globals.szFileName, szFileName); lstrcpy(Globals.szFileName, szFileName);
LANGUAGE_UpdateWindowCaption(); LANGUAGE_UpdateWindowCaption();
...@@ -143,10 +143,10 @@ void DoOpenFile(LPCSTR szFileName) { ...@@ -143,10 +143,10 @@ void DoOpenFile(LPCSTR szFileName) {
VOID DIALOG_FileNew(VOID) VOID DIALOG_FileNew(VOID)
{ {
// Close any files and promt to save changes /* Close any files and promt to save changes */
if (DoCloseFile()) { if (DoCloseFile()) {
// do nothing yet /* do nothing yet */
} }
} }
...@@ -291,7 +291,7 @@ VOID DIALOG_FilePrint(VOID) ...@@ -291,7 +291,7 @@ VOID DIALOG_FilePrint(VOID)
printer.hSetupTemplate = 0; printer.hSetupTemplate = 0;
if (PrintDlg(&printer)) { if (PrintDlg(&printer)) {
// do nothing /* do nothing */
}; };
} }
...@@ -324,7 +324,7 @@ VOID DIALOG_FilePrinterSetup(VOID) ...@@ -324,7 +324,7 @@ VOID DIALOG_FilePrinterSetup(VOID)
printer.hSetupTemplate = 0; printer.hSetupTemplate = 0;
if (PrintDlg(&printer)) { if (PrintDlg(&printer)) {
// do nothing /* do nothing */
}; };
} }
...@@ -408,7 +408,7 @@ VOID DIALOG_Search(VOID) ...@@ -408,7 +408,7 @@ VOID DIALOG_Search(VOID)
} }
else else
{ {
// do nothing yet /* do nothing yet */
}; };
} }
...@@ -469,7 +469,7 @@ VOID DIALOG_PageSetup(VOID) ...@@ -469,7 +469,7 @@ VOID DIALOG_PageSetup(VOID)
VOID DIALOG_TimeDate(VOID) VOID DIALOG_TimeDate(VOID)
{ {
// uses [KERNEL32.310] (ole2nls.c) /* uses [KERNEL32.310] (ole2nls.c) */
SYSTEMTIME st; SYSTEMTIME st;
LPSYSTEMTIME lpst = &st; LPSYSTEMTIME lpst = &st;
......
programs/notepad/language.c
View file @ 73458b03
...@@ -149,7 +149,7 @@ VOID LANGUAGE_Init(VOID) ...@@ -149,7 +149,7 @@ VOID LANGUAGE_Init(VOID)
buffer, sizeof(buffer)); buffer, sizeof(buffer));
Globals.lpszLanguage = p = LocalLock(LocalAlloc(LMEM_FIXED, lstrlen(buffer))); Globals.lpszLanguage = p = LocalLock(LocalAlloc(LMEM_FIXED, lstrlen(buffer)));
strcpy(p, buffer); strcpy(p, buffer);
// hmemcpy(p, buffer, 1 + lstrlen(buffer)); /* hmemcpy(p, buffer, 1 + lstrlen(buffer)); */
#endif #endif
} }
......
programs/notepad/main.c
View file @ 73458b03
...@@ -63,7 +63,7 @@ int NOTEPAD_MenuCommand (WPARAM wParam) ...@@ -63,7 +63,7 @@ int NOTEPAD_MenuCommand (WPARAM wParam)
case NP_HELP_NO_WARRANTY: DIALOG_HelpNoWarranty(); break; case NP_HELP_NO_WARRANTY: DIALOG_HelpNoWarranty(); break;
case NP_HELP_ABOUT_WINE: DIALOG_HelpAboutWine(); break; case NP_HELP_ABOUT_WINE: DIALOG_HelpAboutWine(); break;
// Handle languages /* Handle languages */
default: default:
LANGUAGE_DefaultHandle(wParam); LANGUAGE_DefaultHandle(wParam);
} }
...@@ -189,13 +189,13 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show) ...@@ -189,13 +189,13 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show)
ShowWindow (Globals.hMainWnd, show); ShowWindow (Globals.hMainWnd, show);
UpdateWindow (Globals.hMainWnd); UpdateWindow (Globals.hMainWnd);
// now handle command line /* now handle command line */
while (*cmdline && (*cmdline == ' ' || *cmdline == '-')) while (*cmdline && (*cmdline == ' ' || *cmdline == '-'))
{ {
CHAR option; CHAR option;
// LPCSTR topic_id; /* LPCSTR topic_id; */
if (*cmdline++ == ' ') continue; if (*cmdline++ == ' ') continue;
...@@ -207,14 +207,14 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show) ...@@ -207,14 +207,14 @@ int PASCAL WinMain (HANDLE hInstance, HANDLE prev, LPSTR cmdline, int show)
{ {
case 'p': case 'p':
case 'P': printf("Print file: "); case 'P': printf("Print file: ");
// Not yet able to print a file /* Not yet able to print a file */
break; break;
} }
} }
DragAcceptFiles(Globals.hMainWnd, TRUE); DragAcceptFiles(Globals.hMainWnd, TRUE);
// now enter mesage loop /* now enter mesage loop */
while (GetMessage (&msg, 0, 0, 0)) { while (GetMessage (&msg, 0, 0, 0)) {
TranslateMessage (&msg); TranslateMessage (&msg);
......
rc/systest.c
View file @ 73458b03
...@@ -18,7 +18,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -18,7 +18,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
hInst=hInstance; hInst=hInstance;
// Define the window class for this application. /* Define the window class for this application. */
wcHdumpClass.lpszClassName = "WrcTestClass"; wcHdumpClass.lpszClassName = "WrcTestClass";
wcHdumpClass.hInstance = hInstance; wcHdumpClass.hInstance = hInstance;
wcHdumpClass.lpfnWndProc = WndProc; wcHdumpClass.lpfnWndProc = WndProc;
...@@ -33,14 +33,14 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -33,14 +33,14 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
hWndMain = CreateWindow("WrcTestClass","WrcTest", hWndMain = CreateWindow("WrcTestClass","WrcTest",
WS_OVERLAPPEDWINDOW, WS_OVERLAPPEDWINDOW,
CW_USEDEFAULT, // x window location CW_USEDEFAULT, /* x window location */
CW_USEDEFAULT, // y CW_USEDEFAULT, /* y */
CW_USEDEFAULT, // cx and size CW_USEDEFAULT, /* cx and size */
CW_USEDEFAULT, // cy CW_USEDEFAULT, /* cy */
NULL, // no parent for this window NULL, /* no parent for this window */
NULL, // use the class menu NULL, /* use the class menu */
hInstance, // who created this window hInstance, /* who created this window */
NULL // no parms to pass on NULL /* no parms to pass on */
); );
ShowWindow(hWndMain,SW_SHOW); ShowWindow(hWndMain,SW_SHOW);
UpdateWindow(hWndMain); UpdateWindow(hWndMain);
......
windows/multimon.c
View file @ 73458b03
...@@ -135,7 +135,7 @@ BOOL32 WINAPI EnumDisplayMonitors( ...@@ -135,7 +135,7 @@ BOOL32 WINAPI EnumDisplayMonitors(
break; break;
} }
//fall thru /*fall thru */
case NULLREGION: case NULLREGION:
return TRUE; return TRUE;
case ERROR: case ERROR:
......
windows/nonclient.c
View file @ 73458b03
...@@ -778,8 +778,8 @@ NC_DoNCHitTest95 (WND *wndPtr, POINT16 pt ) ...@@ -778,8 +778,8 @@ NC_DoNCHitTest95 (WND *wndPtr, POINT16 pt )
if (HAS_SIZEFRAME( wndPtr->dwStyle )) if (HAS_SIZEFRAME( wndPtr->dwStyle ))
{ {
InflateRect16( &rect, -SYSMETRICS_CXFRAME, -SYSMETRICS_CYFRAME ); InflateRect16( &rect, -SYSMETRICS_CXFRAME, -SYSMETRICS_CYFRAME );
// if (wndPtr->dwStyle & WS_BORDER) /* if (wndPtr->dwStyle & WS_BORDER) */
// InflateRect16(&rect,-SYSMETRICS_CXBORDER,-SYSMETRICS_CYBORDER); /* InflateRect16(&rect,-SYSMETRICS_CXBORDER,-SYSMETRICS_CYBORDER); */
if (!PtInRect16( &rect, pt )) if (!PtInRect16( &rect, pt ))
{ {
/* Check top sizing border */ /* Check top sizing border */
...@@ -816,8 +816,8 @@ NC_DoNCHitTest95 (WND *wndPtr, POINT16 pt ) ...@@ -816,8 +816,8 @@ NC_DoNCHitTest95 (WND *wndPtr, POINT16 pt )
{ {
if (HAS_FIXEDFRAME( wndPtr->dwStyle, wndPtr->dwExStyle )) if (HAS_FIXEDFRAME( wndPtr->dwStyle, wndPtr->dwExStyle ))
InflateRect16(&rect, -SYSMETRICS_CXDLGFRAME, -SYSMETRICS_CYDLGFRAME); InflateRect16(&rect, -SYSMETRICS_CXDLGFRAME, -SYSMETRICS_CYDLGFRAME);
// else if (wndPtr->dwStyle & WS_BORDER) /* else if (wndPtr->dwStyle & WS_BORDER) */
// InflateRect16(&rect, -SYSMETRICS_CXBORDER, -SYSMETRICS_CYBORDER); /* InflateRect16(&rect, -SYSMETRICS_CXBORDER, -SYSMETRICS_CYBORDER); */
if (!PtInRect16( &rect, pt )) return HTBORDER; if (!PtInRect16( &rect, pt )) return HTBORDER;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment