ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

again.
This commit is contained in:
Marcus Meissner 1998-12-26 12:54:29 +00:00 committed by Alexandre Julliard
parent 151170c437
commit 73458b03cd
40 changed files with 648 additions and 644 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/stabs.c
View File

@ -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];
} }

22
dlls/comctl32/animate.c
View File

@ -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)
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)
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)

16
dlls/comctl32/header.c
View File

@ -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)
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)
} }
// << HEADER_GetOrderArray >> /* << HEADER_GetOrderArray >> */
__inline__ static LRESULT __inline__ static LRESULT
@ -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)
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)
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)
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);

22
dlls/comctl32/hotkey.c
View File

@ -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)
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)
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)
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)
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)

204
dlls/comctl32/listview.c
View File

@ -26,7 +26,7 @@
static VOID static VOID
LISTVIEW_Refresh (WND *wndPtr, HDC32 hdc) LISTVIEW_Refresh (WND *wndPtr, HDC32 hdc)
{ {
// LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); /* LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); */
@ -34,9 +34,9 @@ LISTVIEW_Refresh (WND *wndPtr, HDC32 hdc)
// << LISTVIEW_ApproximateViewRect >> /* << LISTVIEW_ApproximateViewRect >> */
// << LISTVIEW_Arrange >> /* << LISTVIEW_Arrange >> */
// << LISTVIEW_CreateDragImage >> /* << LISTVIEW_CreateDragImage >> */
static LRESULT static LRESULT
@ -151,9 +151,9 @@ LISTVIEW_DeleteItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_EditLabel >> /* << LISTVIEW_EditLabel >> */
// << LISTVIEW_EnsureVisible >> /* << LISTVIEW_EnsureVisible >> */
// << LISTVIEW_FindItem >> /* << LISTVIEW_FindItem >> */
static LRESULT static LRESULT
@ -165,8 +165,8 @@ LISTVIEW_GetBkColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetBkImage >> /* << LISTVIEW_GetBkImage >> */
// << LISTVIEW_GetCallbackMask >> /* << LISTVIEW_GetCallbackMask >> */
static LRESULT static LRESULT
@ -233,8 +233,8 @@ LISTVIEW_GetColumn32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetColumn32W >> /* << LISTVIEW_GetColumn32W >> */
// << LISTVIEW_GetColumnOrderArray >> /* << LISTVIEW_GetColumnOrderArray >> */
__inline__ static LRESULT __inline__ static LRESULT
@ -252,9 +252,9 @@ LISTVIEW_GetColumnWidth (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetCountPerPage >> /* << LISTVIEW_GetCountPerPage >> */
// << LISTVIEW_GetEditControl >> /* << LISTVIEW_GetEditControl >> */
// << LISTVIEW_GetExtendedListviewStyle >> /* << LISTVIEW_GetExtendedListviewStyle >> */
__inline__ static LRESULT __inline__ static LRESULT
@ -266,9 +266,9 @@ LISTVIEW_GetHeader (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetHotCursor >> /* << LISTVIEW_GetHotCursor >> */
// << LISTVIEW_GetHotItem >> /* << LISTVIEW_GetHotItem >> */
// << LISTVIEW_GetHoverTime >> /* << LISTVIEW_GetHoverTime >> */
static LRESULT static LRESULT
@ -293,7 +293,7 @@ LISTVIEW_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetISearchString >> /* << LISTVIEW_GetISearchString >> */
static LRESULT static LRESULT
@ -347,7 +347,7 @@ LISTVIEW_GetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetItem32W >> /* << LISTVIEW_GetItem32W >> */
__inline__ static LRESULT __inline__ static LRESULT
@ -378,9 +378,9 @@ LISTVIEW_GetItemPosition (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetItemRect >> /* << LISTVIEW_GetItemRect >> */
// << LISTVIEW_GetItemSpacing >> /* << LISTVIEW_GetItemSpacing >> */
// << LISTVIEW_GetItemState >> /* << LISTVIEW_GetItemState >> */
static LRESULT static LRESULT
@ -411,7 +411,7 @@ LISTVIEW_GetItemText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetItemText32A >> /* << LISTVIEW_GetItemText32A >> */
static LRESULT static LRESULT
@ -438,8 +438,8 @@ LISTVIEW_GetNextItem (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetNumberOfWorkAreas >> /* << LISTVIEW_GetNumberOfWorkAreas >> */
// << LISTVIEW_GetOrigin >> /* << LISTVIEW_GetOrigin >> */
static LRESULT static LRESULT
@ -453,7 +453,7 @@ LISTVIEW_GetSelectedCount (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_GetSelectionMark >> /* << LISTVIEW_GetSelectionMark >> */
static LRESULT static LRESULT
@ -506,7 +506,7 @@ LISTVIEW_GetTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
static LRESULT static LRESULT
LISTVIEW_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) LISTVIEW_HitTest (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
{ {
// LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); /* LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); */
LPLVHITTESTINFO lpht = (LPLVHITTESTINFO)lParam; LPLVHITTESTINFO lpht = (LPLVHITTESTINFO)lParam;
FIXME (listview, "(%p): stub!\n", lpht); FIXME (listview, "(%p): stub!\n", lpht);
@ -584,7 +584,7 @@ LISTVIEW_InsertColumn32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_InsertColumn32W >> /* << LISTVIEW_InsertColumn32W >> */
static LRESULT static LRESULT
@ -644,13 +644,13 @@ LISTVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_InsertItem32W >> /* << LISTVIEW_InsertItem32W >> */
static LRESULT static LRESULT
LISTVIEW_RedrawItems (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) LISTVIEW_RedrawItems (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
{ {
// LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); /* LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); */
FIXME (listview, "(%d - %d): empty stub!\n", FIXME (listview, "(%d - %d): empty stub!\n",
(INT32)wParam, (INT32)lParam); (INT32)wParam, (INT32)lParam);
@ -841,8 +841,8 @@ LISTVIEW_SetItem32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_SetItem32W >> /* << LISTVIEW_SetItem32W >> */
// << LISTVIEW_SetItemCount >> /* << LISTVIEW_SetItemCount >> */
static LRESULT static LRESULT
@ -899,7 +899,7 @@ LISTVIEW_SetTextColor (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
static LRESULT static LRESULT
LISTVIEW_SortItems (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) LISTVIEW_SortItems (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
{ {
// LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); /* LISTVIEW_INFO *infoPtr = LISTVIEW_GetInfoPtr(wndPtr); */
FIXME (listview, "empty stub!\n"); FIXME (listview, "empty stub!\n");
@ -1008,8 +1008,8 @@ LISTVIEW_GetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << LISTVIEW_HScroll >> /* << LISTVIEW_HScroll >> */
// << LISTVIEW_KeyDown >> /* << LISTVIEW_KeyDown >> */
static LRESULT static LRESULT
@ -1289,9 +1289,9 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
switch (uMsg) switch (uMsg)
{ {
// case LVM_APPROXIMATEVIEWRECT: /* case LVM_APPROXIMATEVIEWRECT: */
// case LVM_ARRANGE: /* case LVM_ARRANGE: */
// case LVM_CREATEDRAGIMAGE: /* case LVM_CREATEDRAGIMAGE: */
case LVM_DELETEALLITEMS: case LVM_DELETEALLITEMS:
return LISTVIEW_DeleteAllItems (wndPtr); return LISTVIEW_DeleteAllItems (wndPtr);
@ -1302,45 +1302,45 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case LVM_DELETEITEM: case LVM_DELETEITEM:
return LISTVIEW_DeleteItem (wndPtr, wParam, lParam); return LISTVIEW_DeleteItem (wndPtr, wParam, lParam);
// case LVM_EDITLABEL: /* case LVM_EDITLABEL: */
// case LVM_ENSUREVISIBLE: /* case LVM_ENSUREVISIBLE: */
// case LVM_FINDITEM: /* case LVM_FINDITEM: */
case LVM_GETBKCOLOR: case LVM_GETBKCOLOR:
return LISTVIEW_GetBkColor (wndPtr, wParam, lParam); return LISTVIEW_GetBkColor (wndPtr, wParam, lParam);
// case LVM_GETBKIMAGE: /* case LVM_GETBKIMAGE: */
// case LVM_GETCALLBACKMASK: /* case LVM_GETCALLBACKMASK: */
case LVM_GETCOLUMN32A: case LVM_GETCOLUMN32A:
return LISTVIEW_GetColumn32A (wndPtr, wParam, lParam); return LISTVIEW_GetColumn32A (wndPtr, wParam, lParam);
// case LVM_GETCOLUMN32W: /* case LVM_GETCOLUMN32W: */
// case LVM_GETCOLUMNORDERARRAY: /* case LVM_GETCOLUMNORDERARRAY: */
case LVM_GETCOLUMNWIDTH: case LVM_GETCOLUMNWIDTH:
return LISTVIEW_GetColumnWidth (wndPtr, wParam, lParam); return LISTVIEW_GetColumnWidth (wndPtr, wParam, lParam);
// case LVM_GETCOUNTPERPAGE: /* case LVM_GETCOUNTPERPAGE: */
// case LVM_GETEDITCONTROL: /* case LVM_GETEDITCONTROL: */
// case LVM_GETEXTENDEDLISTVIEWSTYLE: /* case LVM_GETEXTENDEDLISTVIEWSTYLE: */
case LVM_GETHEADER: case LVM_GETHEADER:
return LISTVIEW_GetHeader (wndPtr, wParam, lParam); return LISTVIEW_GetHeader (wndPtr, wParam, lParam);
// case LVM_GETHOTCURSOR: /* case LVM_GETHOTCURSOR: */
// case LVM_GETHOTITEM: /* case LVM_GETHOTITEM: */
// case LVM_GETHOVERTIME: /* case LVM_GETHOVERTIME: */
case LVM_GETIMAGELIST: case LVM_GETIMAGELIST:
return LISTVIEW_GetImageList (wndPtr, wParam, lParam); return LISTVIEW_GetImageList (wndPtr, wParam, lParam);
// case LVM_GETISEARCHSTRING: /* case LVM_GETISEARCHSTRING: */
case LVM_GETITEM32A: case LVM_GETITEM32A:
return LISTVIEW_GetItem32A (wndPtr, wParam, lParam); return LISTVIEW_GetItem32A (wndPtr, wParam, lParam);
// case LVM_GETITEM32W: /* case LVM_GETITEM32W: */
case LVM_GETITEMCOUNT: case LVM_GETITEMCOUNT:
return LISTVIEW_GetItemCount (wndPtr, wParam, lParam); return LISTVIEW_GetItemCount (wndPtr, wParam, lParam);
@ -1348,31 +1348,31 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case LVM_GETITEMPOSITION: case LVM_GETITEMPOSITION:
return LISTVIEW_GetItemPosition (wndPtr, wParam, lParam); return LISTVIEW_GetItemPosition (wndPtr, wParam, lParam);
// case LVM_GETITEMRECT: /* case LVM_GETITEMRECT: */
// case LVM_GETITEMSPACING: /* case LVM_GETITEMSPACING: */
// case LVM_GETITEMSTATE: /* case LVM_GETITEMSTATE: */
case LVM_GETITEMTEXT32A: case LVM_GETITEMTEXT32A:
return LISTVIEW_GetItemText32A (wndPtr, wParam, lParam); return LISTVIEW_GetItemText32A (wndPtr, wParam, lParam);
// case LVM_GETITEMTEXT32W: /* case LVM_GETITEMTEXT32W: */
case LVM_GETNEXTITEM: case LVM_GETNEXTITEM:
return LISTVIEW_GetNextItem (wndPtr, wParam, lParam); return LISTVIEW_GetNextItem (wndPtr, wParam, lParam);
// case LVM_GETNUMBEROFWORKAREAS: /* case LVM_GETNUMBEROFWORKAREAS: */
// case LVM_GETORIGIN: /* case LVM_GETORIGIN: */
case LVM_GETSELECTEDCOUNT: case LVM_GETSELECTEDCOUNT:
return LISTVIEW_GetSelectedCount (wndPtr, wParam, lParam); return LISTVIEW_GetSelectedCount (wndPtr, wParam, lParam);
// case LVM_GETSELECTIONMARK: /* case LVM_GETSELECTIONMARK: */
case LVM_GETSTRINGWIDTH32A: case LVM_GETSTRINGWIDTH32A:
return LISTVIEW_GetStringWidth32A (wndPtr, wParam, lParam); return LISTVIEW_GetStringWidth32A (wndPtr, wParam, lParam);
// case LVM_GETSTRINGWIDTH32W: /* case LVM_GETSTRINGWIDTH32W: */
// case LVM_GETSUBITEMRECT: /* case LVM_GETSUBITEMRECT: */
case LVM_GETTEXTBKCOLOR: case LVM_GETTEXTBKCOLOR:
return LISTVIEW_GetTextBkColor (wndPtr, wParam, lParam); return LISTVIEW_GetTextBkColor (wndPtr, wParam, lParam);
@ -1380,11 +1380,11 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case LVM_GETTEXTCOLOR: case LVM_GETTEXTCOLOR:
return LISTVIEW_GetTextColor (wndPtr, wParam, lParam); return LISTVIEW_GetTextColor (wndPtr, wParam, lParam);
// case LVM_GETTOOLTIPS: /* case LVM_GETTOOLTIPS: */
// case LVM_GETTOPINDEX: /* case LVM_GETTOPINDEX: */
// case LVM_GETUNICODEFORMAT: /* case LVM_GETUNICODEFORMAT: */
// case LVM_GETVIEWRECT: /* case LVM_GETVIEWRECT: */
// case LVM_GETWORKAREAS: /* case LVM_GETWORKAREAS: */
case LVM_HITTEST: case LVM_HITTEST:
return LISTVIEW_HitTest (wndPtr, wParam, lParam); return LISTVIEW_HitTest (wndPtr, wParam, lParam);
@ -1392,35 +1392,35 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case LVM_INSERTCOLUMN32A: case LVM_INSERTCOLUMN32A:
return LISTVIEW_InsertColumn32A (wndPtr, wParam, lParam); return LISTVIEW_InsertColumn32A (wndPtr, wParam, lParam);
// case LVM_INSERTCOLUMN32W: /* case LVM_INSERTCOLUMN32W: */
case LVM_INSERTITEM32A: case LVM_INSERTITEM32A:
return LISTVIEW_InsertItem32A (wndPtr, wParam, lParam); return LISTVIEW_InsertItem32A (wndPtr, wParam, lParam);
// case LVM_INSERTITEM32W: /* case LVM_INSERTITEM32W: */
case LVM_REDRAWITEMS: case LVM_REDRAWITEMS:
return LISTVIEW_RedrawItems (wndPtr, wParam, lParam); return LISTVIEW_RedrawItems (wndPtr, wParam, lParam);
// case LVM_SCROLL: /* case LVM_SCROLL: */
case LVM_SETBKCOLOR: case LVM_SETBKCOLOR:
return LISTVIEW_SetBkColor (wndPtr, wParam, lParam); return LISTVIEW_SetBkColor (wndPtr, wParam, lParam);
// case LVM_SETBKIMAGE: /* case LVM_SETBKIMAGE: */
// case LVM_SETCALLBACKMASK: /* case LVM_SETCALLBACKMASK: */
case LVM_SETCOLUMN32A: case LVM_SETCOLUMN32A:
return LISTVIEW_SetColumn32A (wndPtr, wParam, lParam); return LISTVIEW_SetColumn32A (wndPtr, wParam, lParam);
// case LVM_SETCOLUMN32W: /* case LVM_SETCOLUMN32W: */
// case LVM_SETCOLUMNORDERARRAY: /* case LVM_SETCOLUMNORDERARRAY: */
// case LVM_SETCOLUMNWIDTH: /* case LVM_SETCOLUMNWIDTH: */
// case LVM_SETEXTENDEDLISTVIEWSTYLE: /* case LVM_SETEXTENDEDLISTVIEWSTYLE: */
// case LVM_SETHOTCURSOR: /* case LVM_SETHOTCURSOR: */
// case LVM_SETHOTITEM: /* case LVM_SETHOTITEM: */
// case LVM_SETHOVERTIME: /* case LVM_SETHOVERTIME: */
// case LVM_SETICONSPACING: /* case LVM_SETICONSPACING: */
case LVM_SETIMAGELIST: case LVM_SETIMAGELIST:
return LISTVIEW_SetImageList (wndPtr, wParam, lParam); return LISTVIEW_SetImageList (wndPtr, wParam, lParam);
@ -1428,16 +1428,16 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case LVM_SETITEM32A: case LVM_SETITEM32A:
return LISTVIEW_SetItem32A (wndPtr, wParam, lParam); return LISTVIEW_SetItem32A (wndPtr, wParam, lParam);
// case LVM_SETITEM32W: /* case LVM_SETITEM32W: */
// case LVM_SETITEMCOUNT: /* case LVM_SETITEMCOUNT: */
case LVM_SETITEMPOSITION: case LVM_SETITEMPOSITION:
return LISTVIEW_SetItemPosition (wndPtr, wParam, lParam); return LISTVIEW_SetItemPosition (wndPtr, wParam, lParam);
// case LVM_SETITEMPOSITION32: /* case LVM_SETITEMPOSITION32: */
// case LVM_SETITEMSTATE: /* case LVM_SETITEMSTATE: */
// case LVM_SETITEMTEXT: /* case LVM_SETITEMTEXT: */
// case LVM_SETSELECTIONMARK: /* case LVM_SETSELECTIONMARK: */
case LVM_SETTEXTBKCOLOR: case LVM_SETTEXTBKCOLOR:
return LISTVIEW_SetTextBkColor (wndPtr, wParam, lParam); return LISTVIEW_SetTextBkColor (wndPtr, wParam, lParam);
@ -1445,20 +1445,20 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case LVM_SETTEXTCOLOR: case LVM_SETTEXTCOLOR:
return LISTVIEW_SetTextColor (wndPtr, wParam, lParam); return LISTVIEW_SetTextColor (wndPtr, wParam, lParam);
// case LVM_SETTOOLTIPS: /* case LVM_SETTOOLTIPS: */
// case LVM_SETUNICODEFORMAT: /* case LVM_SETUNICODEFORMAT: */
// case LVM_SETWORKAREAS: /* case LVM_SETWORKAREAS: */
case LVM_SORTITEMS: case LVM_SORTITEMS:
return LISTVIEW_SortItems (wndPtr, wParam, lParam); return LISTVIEW_SortItems (wndPtr, wParam, lParam);
// case LVM_SUBITEMHITTEST: /* case LVM_SUBITEMHITTEST: */
// case LVM_UPDATE: /* case LVM_UPDATE: */
// case WM_CHAR: /* case WM_CHAR: */
// case WM_COMMAND: /* case WM_COMMAND: */
case WM_CREATE: case WM_CREATE:
return LISTVIEW_Create (wndPtr, wParam, lParam); return LISTVIEW_Create (wndPtr, wParam, lParam);
@ -1475,8 +1475,8 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_GETFONT: case WM_GETFONT:
return LISTVIEW_GetFont (wndPtr, wParam, lParam); return LISTVIEW_GetFont (wndPtr, wParam, lParam);
// case WM_HSCROLL: /* case WM_HSCROLL: */
// case WM_KEYDOWN: /* case WM_KEYDOWN: */
case WM_KILLFOCUS: case WM_KILLFOCUS:
return LISTVIEW_KillFocus (wndPtr, wParam, lParam); return LISTVIEW_KillFocus (wndPtr, wParam, lParam);
@ -1487,8 +1487,8 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
return LISTVIEW_LButtonDown (wndPtr, wParam, lParam); return LISTVIEW_LButtonDown (wndPtr, wParam, lParam);
// case WM_MOUSEMOVE: /* case WM_MOUSEMOVE: */
// return LISTVIEW_MouseMove (wndPtr, wParam, lParam); /* return LISTVIEW_MouseMove (wndPtr, wParam, lParam); */
case WM_NCCREATE: case WM_NCCREATE:
return LISTVIEW_NCCreate (wndPtr, wParam, lParam); return LISTVIEW_NCCreate (wndPtr, wParam, lParam);
@ -1514,15 +1514,15 @@ LISTVIEW_WindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_SETFONT: case WM_SETFONT:
return LISTVIEW_SetFont (wndPtr, wParam, lParam); return LISTVIEW_SetFont (wndPtr, wParam, lParam);
// case WM_SETREDRAW: /* case WM_SETREDRAW: */
case WM_SIZE: case WM_SIZE:
return LISTVIEW_Size (wndPtr, wParam, lParam); return LISTVIEW_Size (wndPtr, wParam, lParam);
// case WM_TIMER: /* case WM_TIMER: */
// case WM_VSCROLL: /* case WM_VSCROLL: */
// case WM_WINDOWPOSCHANGED: /* case WM_WINDOWPOSCHANGED: */
// case WM_WININICHANGE: /* case WM_WININICHANGE: */
default: default:
if (uMsg >= WM_USER) if (uMsg >= WM_USER)

20
dlls/comctl32/pager.c
View File

@ -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)
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)
} }
// << PAGER_Paint >> /* << PAGER_Paint >> */
static LRESULT static LRESULT
@ -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)
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)
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);

66
dlls/comctl32/rebar.c
View File

@ -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)
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
// << REBAR_BeginDrag >> /* << REBAR_BeginDrag >> */
static LRESULT static LRESULT
@ -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)
} }
// << REBAR_GetColorScheme >> /* << REBAR_GetColorScheme >> */
// << REBAR_GetDropTarget >> /* << REBAR_GetDropTarget >> */
static LRESULT static LRESULT
@ -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)
} }
// << 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)
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)
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)
} }
// << REBAR_SetColorScheme >> /* << REBAR_SetColorScheme >> */
// << REBAR_SetPalette >> /* << REBAR_SetPalette >> */
static LRESULT static LRESULT
@ -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)
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)
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)
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)
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)
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)
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)
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)

144
dlls/comctl32/toolbar.c
View File

@ -33,7 +33,7 @@
#include "win.h" #include "win.h"
#include "debug.h" #include "debug.h"
// #define __NEW_WRAP_CODE__ /* #define __NEW_WRAP_CODE__ */
#define SEPARATOR_WIDTH 8 #define SEPARATOR_WIDTH 8
#define SEPARATOR_HEIGHT 5 #define SEPARATOR_HEIGHT 5
@ -188,11 +188,11 @@ TOOLBAR_DrawButton (WND *wndPtr, TBUTTON_INFO *btnPtr, HDC32 hdc)
BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST); BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
if (bFlat) { if (bFlat) {
// if (infoPtr->himlDis) /* if (infoPtr->himlDis) */
ImageList_Draw (infoPtr->himlDis, btnPtr->iBitmap, hdc, ImageList_Draw (infoPtr->himlDis, btnPtr->iBitmap, hdc,
rc.left+1, rc.top+1, ILD_NORMAL); rc.left+1, rc.top+1, ILD_NORMAL);
// else /* else */
// TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1); /* TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1); */
} }
else else
TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1); TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1);
@ -341,7 +341,7 @@ TOOLBAR_CalcToolbar (WND *wndPtr)
nRows = 0; nRows = 0;
/* calculate the size of each button according to it's style */ /* calculate the size of each button according to it's style */
// TOOLBAR_CalcButtons (wndPtr); /* TOOLBAR_CalcButtons (wndPtr); */
infoPtr->rcBound.top = y; infoPtr->rcBound.top = y;
infoPtr->rcBound.left = x; infoPtr->rcBound.left = x;
@ -358,7 +358,7 @@ TOOLBAR_CalcToolbar (WND *wndPtr)
} }
#ifdef __NEW_WRAP_CODE__ #ifdef __NEW_WRAP_CODE__
//#if 0 /*#if 0 */
if (btnPtr->fsStyle & TBSTYLE_SEP) { if (btnPtr->fsStyle & TBSTYLE_SEP) {
/* UNDOCUMENTED: If a separator has a non zero bitmap index, */ /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
/* it is the actual width of the separator. This is used for */ /* it is the actual width of the separator. This is used for */
@ -370,8 +370,8 @@ TOOLBAR_CalcToolbar (WND *wndPtr)
cx = infoPtr->nWidth; cx = infoPtr->nWidth;
cy = ((btnPtr->iBitmap > 0) ? cy = ((btnPtr->iBitmap > 0) ?
btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 / 3; btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 / 3;
// nRows++; /* nRows++; */
// bWrap = TRUE; /* bWrap = TRUE; */
} }
else else
cx = (btnPtr->iBitmap > 0) ? cx = (btnPtr->iBitmap > 0) ?
@ -381,7 +381,7 @@ TOOLBAR_CalcToolbar (WND *wndPtr)
/* this must be a button */ /* this must be a button */
cx = infoPtr->nButtonWidth; cx = infoPtr->nButtonWidth;
} }
//#endif /*#endif */
/* --- begin test --- */ /* --- begin test --- */
if ((i >= nGrpCount) && (btnPtr->fsStyle & TBSTYLE_GROUP)) { if ((i >= nGrpCount) && (btnPtr->fsStyle & TBSTYLE_GROUP)) {
@ -732,7 +732,7 @@ TOOLBAR_AddButtons32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_AddButtons32W >> /* << TOOLBAR_AddButtons32W >> */
static LRESULT static LRESULT
@ -1111,7 +1111,7 @@ TOOLBAR_EnableButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_GetAnchorHighlight >> /* << TOOLBAR_GetAnchorHighlight >> */
static LRESULT static LRESULT
@ -1202,7 +1202,7 @@ TOOLBAR_GetButtonInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_GetButtonInfo32W >> /* << TOOLBAR_GetButtonInfo32W >> */
static LRESULT static LRESULT
@ -1240,8 +1240,8 @@ TOOLBAR_GetButtonText32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_GetButtonText32W >> /* << TOOLBAR_GetButtonText32W >> */
// << TOOLBAR_GetColorScheme >> /* << TOOLBAR_GetColorScheme >> */
static LRESULT static LRESULT
@ -1277,7 +1277,7 @@ TOOLBAR_GetHotImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_GetHotItem >> /* << TOOLBAR_GetHotItem >> */
static LRESULT static LRESULT
@ -1292,8 +1292,8 @@ TOOLBAR_GetImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_GetInsertMark >> /* << TOOLBAR_GetInsertMark >> */
// << TOOLBAR_GetInsertMarkColor >> /* << TOOLBAR_GetInsertMarkColor >> */
static LRESULT static LRESULT
@ -1342,8 +1342,8 @@ TOOLBAR_GetMaxSize (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_GetObject >> /* << TOOLBAR_GetObject >> */
// << TOOLBAR_GetPadding >> /* << TOOLBAR_GetPadding >> */
static LRESULT static LRESULT
@ -1569,8 +1569,8 @@ TOOLBAR_InsertButton32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_InsertButton32W >> /* << TOOLBAR_InsertButton32W >> */
// << TOOLBAR_InsertMarkHitTest >> /* << TOOLBAR_InsertMarkHitTest >> */
static LRESULT static LRESULT
@ -1657,10 +1657,10 @@ TOOLBAR_IsButtonPressed (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_LoadImages >> /* << TOOLBAR_LoadImages >> */
// << TOOLBAR_MapAccelerator >> /* << TOOLBAR_MapAccelerator >> */
// << TOOLBAR_MarkButton >> /* << TOOLBAR_MarkButton >> */
// << TOOLBAR_MoveButton >> /* << TOOLBAR_MoveButton >> */
static LRESULT static LRESULT
@ -1689,7 +1689,7 @@ TOOLBAR_PressButton (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_ReplaceBitmap >> /* << TOOLBAR_ReplaceBitmap >> */
static LRESULT static LRESULT
@ -1722,8 +1722,8 @@ TOOLBAR_SaveRestore32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_SaveRestore32W >> /* << TOOLBAR_SaveRestore32W >> */
// << TOOLBAR_SetAnchorHighlight >> /* << TOOLBAR_SetAnchorHighlight >> */
static LRESULT static LRESULT
@ -1765,8 +1765,8 @@ TOOLBAR_SetButtonInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
btnPtr->iBitmap = lptbbi->iImage; btnPtr->iBitmap = lptbbi->iImage;
if (lptbbi->dwMask & TBIF_LPARAM) if (lptbbi->dwMask & TBIF_LPARAM)
btnPtr->dwData = lptbbi->lParam; btnPtr->dwData = lptbbi->lParam;
// if (lptbbi->dwMask & TBIF_SIZE) /* if (lptbbi->dwMask & TBIF_SIZE) */
// btnPtr->cx = lptbbi->cx; /* btnPtr->cx = lptbbi->cx; */
if (lptbbi->dwMask & TBIF_STATE) if (lptbbi->dwMask & TBIF_STATE)
btnPtr->fsState = lptbbi->fsState; btnPtr->fsState = lptbbi->fsState;
if (lptbbi->dwMask & TBIF_STYLE) if (lptbbi->dwMask & TBIF_STYLE)
@ -1782,7 +1782,7 @@ TOOLBAR_SetButtonInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
#endif #endif
/* this is the ultimate sollution */ /* this is the ultimate sollution */
// Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); /* Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); */
} }
} }
@ -1790,7 +1790,7 @@ TOOLBAR_SetButtonInfo32A (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_SetButtonInfo32W >> /* << TOOLBAR_SetButtonInfo32W >> */
static LRESULT static LRESULT
@ -1844,7 +1844,7 @@ TOOLBAR_SetCmdId (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_SetColorScheme >> /* << TOOLBAR_SetColorScheme >> */
static LRESULT static LRESULT
@ -1910,7 +1910,7 @@ TOOLBAR_SetHotImageList (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_SetHotItem >> /* << TOOLBAR_SetHotItem >> */
static LRESULT static LRESULT
@ -1947,7 +1947,7 @@ TOOLBAR_SetIndent (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_SetInsertMark >> /* << TOOLBAR_SetInsertMark >> */
static LRESULT static LRESULT
@ -1977,7 +1977,7 @@ TOOLBAR_SetMaxTextRows (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
} }
// << TOOLBAR_SetPadding >> /* << TOOLBAR_SetPadding >> */
static LRESULT static LRESULT
@ -2404,11 +2404,11 @@ TOOLBAR_MouseMove (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
__inline__ static LRESULT __inline__ static LRESULT
TOOLBAR_NCActivate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam) TOOLBAR_NCActivate (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
{ {
// if (wndPtr->dwStyle & CCS_NODIVIDER) /* if (wndPtr->dwStyle & CCS_NODIVIDER) */
return DefWindowProc32A (wndPtr->hwndSelf, WM_NCACTIVATE, return DefWindowProc32A (wndPtr->hwndSelf, WM_NCACTIVATE,
wParam, lParam); wParam, lParam);
// else /* else */
// return TOOLBAR_NCPaint (wndPtr, wParam, lParam); /* return TOOLBAR_NCPaint (wndPtr, wParam, lParam); */
} }
@ -2561,7 +2561,7 @@ TOOLBAR_Size (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE); uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
/* FIXME */ /* FIXME */
// infoPtr->nWidth = parent_rect.right - parent_rect.left; /* infoPtr->nWidth = parent_rect.right - parent_rect.left; */
cy = infoPtr->nHeight; cy = infoPtr->nHeight;
cx = infoPtr->nWidth; cx = infoPtr->nWidth;
TOOLBAR_CalcToolbar (wndPtr); TOOLBAR_CalcToolbar (wndPtr);
@ -2620,7 +2620,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_ADDBUTTONS32A: case TB_ADDBUTTONS32A:
return TOOLBAR_AddButtons32A (wndPtr, wParam, lParam); return TOOLBAR_AddButtons32A (wndPtr, wParam, lParam);
// case TB_ADDBUTTONS32W: /* case TB_ADDBUTTONS32W: */
case TB_ADDSTRING32A: case TB_ADDSTRING32A:
return TOOLBAR_AddString32A (wndPtr, wParam, lParam); return TOOLBAR_AddString32A (wndPtr, wParam, lParam);
@ -2655,7 +2655,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_ENABLEBUTTON: case TB_ENABLEBUTTON:
return TOOLBAR_EnableButton (wndPtr, wParam, lParam); return TOOLBAR_EnableButton (wndPtr, wParam, lParam);
// case TB_GETANCHORHIGHLIGHT: /* 4.71 */ /* case TB_GETANCHORHIGHLIGHT: */ /* 4.71 */
case TB_GETBITMAP: case TB_GETBITMAP:
return TOOLBAR_GetBitmap (wndPtr, wParam, lParam); return TOOLBAR_GetBitmap (wndPtr, wParam, lParam);
@ -2669,7 +2669,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_GETBUTTONINFO32A: case TB_GETBUTTONINFO32A:
return TOOLBAR_GetButtonInfo32A (wndPtr, wParam, lParam); return TOOLBAR_GetButtonInfo32A (wndPtr, wParam, lParam);
// case TB_GETBUTTONINFO32W: /* 4.71 */ /* case TB_GETBUTTONINFO32W: */ /* 4.71 */
case TB_GETBUTTONSIZE: case TB_GETBUTTONSIZE:
return TOOLBAR_GetButtonSize (wndPtr); return TOOLBAR_GetButtonSize (wndPtr);
@ -2677,8 +2677,8 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_GETBUTTONTEXT32A: case TB_GETBUTTONTEXT32A:
return TOOLBAR_GetButtonText32A (wndPtr, wParam, lParam); return TOOLBAR_GetButtonText32A (wndPtr, wParam, lParam);
// case TB_GETBUTTONTEXT32W: /* case TB_GETBUTTONTEXT32W: */
// case TB_GETCOLORSCHEME: /* 4.71 */ /* case TB_GETCOLORSCHEME: */ /* 4.71 */
case TB_GETDISABLEDIMAGELIST: case TB_GETDISABLEDIMAGELIST:
return TOOLBAR_GetDisabledImageList (wndPtr, wParam, lParam); return TOOLBAR_GetDisabledImageList (wndPtr, wParam, lParam);
@ -2689,13 +2689,13 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_GETHOTIMAGELIST: case TB_GETHOTIMAGELIST:
return TOOLBAR_GetHotImageList (wndPtr, wParam, lParam); return TOOLBAR_GetHotImageList (wndPtr, wParam, lParam);
// case TB_GETHOTITEM: /* 4.71 */ /* case TB_GETHOTITEM: */ /* 4.71 */
case TB_GETIMAGELIST: case TB_GETIMAGELIST:
return TOOLBAR_GetImageList (wndPtr, wParam, lParam); return TOOLBAR_GetImageList (wndPtr, wParam, lParam);
// case TB_GETINSERTMARK: /* 4.71 */ /* case TB_GETINSERTMARK: */ /* 4.71 */
// case TB_GETINSERTMARKCOLOR: /* 4.71 */ /* case TB_GETINSERTMARKCOLOR: */ /* 4.71 */
case TB_GETITEMRECT: case TB_GETITEMRECT:
return TOOLBAR_GetItemRect (wndPtr, wParam, lParam); return TOOLBAR_GetItemRect (wndPtr, wParam, lParam);
@ -2703,8 +2703,8 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_GETMAXSIZE: case TB_GETMAXSIZE:
return TOOLBAR_GetMaxSize (wndPtr, wParam, lParam); return TOOLBAR_GetMaxSize (wndPtr, wParam, lParam);
// case TB_GETOBJECT: /* 4.71 */ /* case TB_GETOBJECT: */ /* 4.71 */
// case TB_GETPADDING: /* 4.71 */ /* case TB_GETPADDING: */ /* 4.71 */
case TB_GETRECT: case TB_GETRECT:
return TOOLBAR_GetRect (wndPtr, wParam, lParam); return TOOLBAR_GetRect (wndPtr, wParam, lParam);
@ -2739,8 +2739,8 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_INSERTBUTTON32A: case TB_INSERTBUTTON32A:
return TOOLBAR_InsertButton32A (wndPtr, wParam, lParam); return TOOLBAR_InsertButton32A (wndPtr, wParam, lParam);
// case TB_INSERTBUTTON32W: /* case TB_INSERTBUTTON32W: */
// case TB_INSERTMARKHITTEST: /* 4.71 */ /* case TB_INSERTMARKHITTEST: */ /* 4.71 */
case TB_ISBUTTONCHECKED: case TB_ISBUTTONCHECKED:
return TOOLBAR_IsButtonChecked (wndPtr, wParam, lParam); return TOOLBAR_IsButtonChecked (wndPtr, wParam, lParam);
@ -2760,22 +2760,22 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_ISBUTTONPRESSED: case TB_ISBUTTONPRESSED:
return TOOLBAR_IsButtonPressed (wndPtr, wParam, lParam); return TOOLBAR_IsButtonPressed (wndPtr, wParam, lParam);
// case TB_LOADIMAGES: /* 4.70 */ /* case TB_LOADIMAGES: */ /* 4.70 */
// case TB_MAPACCELERATOR32A: /* 4.71 */ /* case TB_MAPACCELERATOR32A: */ /* 4.71 */
// case TB_MAPACCELERATOR32W: /* 4.71 */ /* case TB_MAPACCELERATOR32W: */ /* 4.71 */
// case TB_MARKBUTTON: /* 4.71 */ /* case TB_MARKBUTTON: */ /* 4.71 */
// case TB_MOVEBUTTON: /* 4.71 */ /* case TB_MOVEBUTTON: */ /* 4.71 */
case TB_PRESSBUTTON: case TB_PRESSBUTTON:
return TOOLBAR_PressButton (wndPtr, wParam, lParam); return TOOLBAR_PressButton (wndPtr, wParam, lParam);
// case TB_REPLACEBITMAP: /* case TB_REPLACEBITMAP: */
case TB_SAVERESTORE32A: case TB_SAVERESTORE32A:
return TOOLBAR_SaveRestore32A (wndPtr, wParam, lParam); return TOOLBAR_SaveRestore32A (wndPtr, wParam, lParam);
// case TB_SAVERESTORE32W: /* case TB_SAVERESTORE32W: */
// case TB_SETANCHORHIGHLIGHT: /* 4.71 */ /* case TB_SETANCHORHIGHLIGHT: */ /* 4.71 */
case TB_SETBITMAPSIZE: case TB_SETBITMAPSIZE:
return TOOLBAR_SetBitmapSize (wndPtr, wParam, lParam); return TOOLBAR_SetBitmapSize (wndPtr, wParam, lParam);
@ -2783,7 +2783,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_SETBUTTONINFO32A: case TB_SETBUTTONINFO32A:
return TOOLBAR_SetButtonInfo32A (wndPtr, wParam, lParam); return TOOLBAR_SetButtonInfo32A (wndPtr, wParam, lParam);
// case TB_SETBUTTONINFO32W: /* 4.71 */ /* case TB_SETBUTTONINFO32W: */ /* 4.71 */
case TB_SETBUTTONSIZE: case TB_SETBUTTONSIZE:
return TOOLBAR_SetButtonSize (wndPtr, wParam, lParam); return TOOLBAR_SetButtonSize (wndPtr, wParam, lParam);
@ -2794,7 +2794,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_SETCMDID: case TB_SETCMDID:
return TOOLBAR_SetCmdId (wndPtr, wParam, lParam); return TOOLBAR_SetCmdId (wndPtr, wParam, lParam);
// case TB_SETCOLORSCHEME: /* 4.71 */ /* case TB_SETCOLORSCHEME: */ /* 4.71 */
case TB_SETDISABLEDIMAGELIST: case TB_SETDISABLEDIMAGELIST:
return TOOLBAR_SetDisabledImageList (wndPtr, wParam, lParam); return TOOLBAR_SetDisabledImageList (wndPtr, wParam, lParam);
@ -2808,7 +2808,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_SETHOTIMAGELIST: case TB_SETHOTIMAGELIST:
return TOOLBAR_SetHotImageList (wndPtr, wParam, lParam); return TOOLBAR_SetHotImageList (wndPtr, wParam, lParam);
// case TB_SETHOTITEM: /* 4.71 */ /* case TB_SETHOTITEM: */ /* 4.71 */
case TB_SETIMAGELIST: case TB_SETIMAGELIST:
return TOOLBAR_SetImageList (wndPtr, wParam, lParam); return TOOLBAR_SetImageList (wndPtr, wParam, lParam);
@ -2816,7 +2816,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_SETINDENT: case TB_SETINDENT:
return TOOLBAR_SetIndent (wndPtr, wParam, lParam); return TOOLBAR_SetIndent (wndPtr, wParam, lParam);
// case TB_SETINSERTMARK: /* 4.71 */ /* case TB_SETINSERTMARK: */ /* 4.71 */
case TB_SETINSERTMARKCOLOR: case TB_SETINSERTMARKCOLOR:
return TOOLBAR_SetInsertMarkColor (wndPtr, wParam, lParam); return TOOLBAR_SetInsertMarkColor (wndPtr, wParam, lParam);
@ -2824,7 +2824,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case TB_SETMAXTEXTROWS: case TB_SETMAXTEXTROWS:
return TOOLBAR_SetMaxTextRows (wndPtr, wParam, lParam); return TOOLBAR_SetMaxTextRows (wndPtr, wParam, lParam);
// case TB_SETPADDING: /* 4.71 */ /* case TB_SETPADDING: */ /* 4.71 */
case TB_SETPARENT: case TB_SETPARENT:
return TOOLBAR_SetParent (wndPtr, wParam, lParam); return TOOLBAR_SetParent (wndPtr, wParam, lParam);
@ -2845,7 +2845,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
return TOOLBAR_SetUnicodeFormat (wndPtr, wParam, lParam); return TOOLBAR_SetUnicodeFormat (wndPtr, wParam, lParam);
// case WM_CHAR: /* case WM_CHAR: */
case WM_CREATE: case WM_CREATE:
return TOOLBAR_Create (wndPtr, wParam, lParam); return TOOLBAR_Create (wndPtr, wParam, lParam);
@ -2856,9 +2856,9 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_ERASEBKGND: case WM_ERASEBKGND:
return TOOLBAR_EraseBackground (wndPtr, wParam, lParam); return TOOLBAR_EraseBackground (wndPtr, wParam, lParam);
// case WM_GETFONT: /* case WM_GETFONT: */
// case WM_KEYDOWN: /* case WM_KEYDOWN: */
// case WM_KILLFOCUS: /* case WM_KILLFOCUS: */
case WM_LBUTTONDBLCLK: case WM_LBUTTONDBLCLK:
return TOOLBAR_LButtonDblClk (wndPtr, wParam, lParam); return TOOLBAR_LButtonDblClk (wndPtr, wParam, lParam);
@ -2887,7 +2887,7 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_NOTIFY: case WM_NOTIFY:
return TOOLBAR_Notify (wndPtr, wParam, lParam); return TOOLBAR_Notify (wndPtr, wParam, lParam);
// case WM_NOTIFYFORMAT: /* case WM_NOTIFYFORMAT: */
case WM_PAINT: case WM_PAINT:
return TOOLBAR_Paint (wndPtr, wParam); return TOOLBAR_Paint (wndPtr, wParam);
@ -2898,9 +2898,9 @@ ToolbarWindowProc (HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam)
case WM_STYLECHANGED: case WM_STYLECHANGED:
return TOOLBAR_StyleChanged (wndPtr, wParam, lParam); return TOOLBAR_StyleChanged (wndPtr, wParam, lParam);
// case WM_SYSCOLORCHANGE: /* case WM_SYSCOLORCHANGE: */
// case WM_WININICHANGE: /* case WM_WININICHANGE: */
case WM_CHARTOITEM: case WM_CHARTOITEM:
case WM_COMMAND: case WM_COMMAND:

22
dlls/comctl32/tooltips.c
View File

@ -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)
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)
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)
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)
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)
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)
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)
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)
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)
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);

20
dlls/comctl32/trackbar.c
View File

@ -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)
} }
// case TBM_GETUNICODEFORMAT: /* case TBM_GETUNICODEFORMAT: */
static LRESULT static LRESULT
@ -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)
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)
{ {
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)
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)
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)
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;

20
dlls/comctl32/treeview.c
View File

@ -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)
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)
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)
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)
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)
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:

2
dlls/shell32/contmenu.c
View File

@ -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++;

12
dlls/shell32/enumidlist.c
View File

@ -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
} }
} }
} }
//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
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;

18
dlls/shell32/pidl.c
View File

@ -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)
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)
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)
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
/* 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
} }
_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)
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)
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;
} }

4
dlls/shell32/shellord.c
View File

@ -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

52
dlls/shell32/shlview.c
View File

@ -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 =
#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)
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)
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)
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)
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)
/*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)
{ 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)
*/ */
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)
/*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)
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);
} }

6
files/profile.c
View File

@ -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

4
graphics/path.c
View File

@ -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);
} }

8
include/commctrl.h
View File

@ -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)
#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)

2
include/d3d.h
View File

@ -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;

50
include/dplay.h
View File

@ -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
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;

18
include/dsound.h
View File

@ -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;
#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;
#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;
#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;

2
include/ole.h
View File

@ -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)

2
include/oleobj.h
View File

@ -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)

156
include/shlobj.h
View File

@ -131,7 +131,7 @@ typedef struct _STRRET
*/ */
#define THIS LPPERSISTFILE this #define THIS LPPERSISTFILE this
typedef struct IPersistFile_VTable typedef struct IPersistFile_VTable
{ // *** IUnknown methods *** { /* *** IUnknown methods *** */
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
@ -171,16 +171,16 @@ struct tagPERSISTFILE
#define CMF_CANRENAME 0x00000010 #define CMF_CANRENAME 0x00000010
#define CMF_NODEFAULT 0x00000020 #define CMF_NODEFAULT 0x00000020
#define CMF_INCLUDESTATIC 0x00000040 #define CMF_INCLUDESTATIC 0x00000040
#define CMF_RESERVED 0xffff0000 // View specific #define CMF_RESERVED 0xffff0000 /* View specific */
/* GetCommandString uFlags */ /* GetCommandString uFlags */
#define GCS_VERBA 0x00000000 // canonical verb #define GCS_VERBA 0x00000000 /* canonical verb */
#define GCS_HELPTEXTA 0x00000001 // help text (for status bar) #define GCS_HELPTEXTA 0x00000001 /* help text (for status bar) */
#define GCS_VALIDATEA 0x00000002 // validate command exists #define GCS_VALIDATEA 0x00000002 /* validate command exists */
#define GCS_VERBW 0x00000004 // canonical verb (unicode) #define GCS_VERBW 0x00000004 /* canonical verb (unicode) */
#define GCS_HELPTEXTW 0x00000005 // help text (unicode version) #define GCS_HELPTEXTW 0x00000005 /* help text (unicode version) */
#define GCS_VALIDATEW 0x00000006 // validate command exists (unicode) #define GCS_VALIDATEW 0x00000006 /* validate command exists (unicode) */
#define GCS_UNICODE 0x00000004 // for bit testing - Unicode string #define GCS_UNICODE 0x00000004 /* for bit testing - Unicode string */
#define GCS_VERB GCS_VERBA #define GCS_VERB GCS_VERBA
#define GCS_HELPTEXT GCS_HELPTEXTA #define GCS_HELPTEXT GCS_HELPTEXTA
@ -211,42 +211,42 @@ struct tagPERSISTFILE
/*NOTE: When SEE_MASK_HMONITOR is set, hIcon is treated as hMonitor */ /*NOTE: When SEE_MASK_HMONITOR is set, hIcon is treated as hMonitor */
typedef struct tagCMINVOKECOMMANDINFO typedef struct tagCMINVOKECOMMANDINFO
{ DWORD cbSize; // sizeof(CMINVOKECOMMANDINFO) { DWORD cbSize; /* sizeof(CMINVOKECOMMANDINFO) */
DWORD fMask; // any combination of CMIC_MASK_* DWORD fMask; /* any combination of CMIC_MASK_* */
HWND32 hwnd; // might be NULL (indicating no owner window) HWND32 hwnd; /* might be NULL (indicating no owner window) */
LPCSTR lpVerb; // either a string or MAKEINTRESOURCE(idOffset) LPCSTR lpVerb; /* either a string or MAKEINTRESOURCE(idOffset) */
LPCSTR lpParameters; // might be NULL (indicating no parameter) LPCSTR lpParameters; /* might be NULL (indicating no parameter) */
LPCSTR lpDirectory; // might be NULL (indicating no specific directory) LPCSTR lpDirectory; /* might be NULL (indicating no specific directory) */
INT32 nShow; // one of SW_ values for ShowWindow() API INT32 nShow; /* one of SW_ values for ShowWindow() API */
DWORD dwHotKey; DWORD dwHotKey;
HANDLE32 hIcon; HANDLE32 hIcon;
} CMINVOKECOMMANDINFO32, *LPCMINVOKECOMMANDINFO32; } CMINVOKECOMMANDINFO32, *LPCMINVOKECOMMANDINFO32;
typedef struct tagCMInvokeCommandInfoEx typedef struct tagCMInvokeCommandInfoEx
{ DWORD cbSize; // must be sizeof(CMINVOKECOMMANDINFOEX) { DWORD cbSize; /* must be sizeof(CMINVOKECOMMANDINFOEX) */
DWORD fMask; // any combination of CMIC_MASK_* DWORD fMask; /* any combination of CMIC_MASK_* */
HWND32 hwnd; // might be NULL (indicating no owner window) HWND32 hwnd; /* might be NULL (indicating no owner window) */
LPCSTR lpVerb; // either a string or MAKEINTRESOURCE(idOffset) LPCSTR lpVerb; /* either a string or MAKEINTRESOURCE(idOffset) */
LPCSTR lpParameters; // might be NULL (indicating no parameter) LPCSTR lpParameters; /* might be NULL (indicating no parameter) */
LPCSTR lpDirectory; // might be NULL (indicating no specific directory) LPCSTR lpDirectory; /* might be NULL (indicating no specific directory) */
INT32 nShow; // one of SW_ values for ShowWindow() API INT32 nShow; /* one of SW_ values for ShowWindow() API */
DWORD dwHotKey; DWORD dwHotKey;
HANDLE32 hIcon; HANDLE32 hIcon;
LPCSTR lpTitle; // For CreateProcess-StartupInfo.lpTitle LPCSTR lpTitle; /* For CreateProcess-StartupInfo.lpTitle */
LPCWSTR lpVerbW; // Unicode verb (for those who can use it) LPCWSTR lpVerbW; /* Unicode verb (for those who can use it) */
LPCWSTR lpParametersW; // Unicode parameters (for those who can use it) LPCWSTR lpParametersW; /* Unicode parameters (for those who can use it) */
LPCWSTR lpDirectoryW; // Unicode directory (for those who can use it) LPCWSTR lpDirectoryW; /* Unicode directory (for those who can use it) */
LPCWSTR lpTitleW; // Unicode title (for those who can use it) LPCWSTR lpTitleW; /* Unicode title (for those who can use it) */
POINT32 ptInvoke; // Point where it's invoked POINT32 ptInvoke; /* Point where it's invoked */
} CMINVOKECOMMANDINFOEX32, *LPCMINVOKECOMMANDINFOEX32; } CMINVOKECOMMANDINFOEX32, *LPCMINVOKECOMMANDINFOEX32;
typedef struct IContextMenu_VTable typedef struct IContextMenu_VTable
{ // *** IUnknown methods *** { /* *** IUnknown methods *** */
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
@ -465,12 +465,12 @@ struct tagDATAOBJECT
#define THIS LPSHELLEXTINIT this #define THIS LPSHELLEXTINIT this
typedef struct IShellExtInit_VTable typedef struct IShellExtInit_VTable
{ // *** IUnknown methods *** { /* *** IUnknown methods *** */
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// *** IShellExtInit methods *** /* *** IShellExtInit methods *** */
STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST pidlFolder, LPDATAOBJECT lpdobj, HKEY hkeyProgID) PURE; STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST pidlFolder, LPDATAOBJECT lpdobj, HKEY hkeyProgID) PURE;
} IShellExtInit_VTable,*LPSHELLEXTINIT_VTABLE; } IShellExtInit_VTable,*LPSHELLEXTINIT_VTABLE;
@ -521,23 +521,23 @@ struct tagENUMIDLIST
}; };
#undef THIS #undef THIS
//-------------------------------------------------------------------------- /*-------------------------------------------------------------------------- */
// /* */
// FOLDERSETTINGS /* FOLDERSETTINGS */
// /* */
// FOLDERSETTINGS is a data structure that explorer passes from one folder /* FOLDERSETTINGS is a data structure that explorer passes from one folder */
// view to another, when the user is browsing. It calls ISV::GetCurrentInfo /* view to another, when the user is browsing. It calls ISV::GetCurrentInfo */
// member to get the current settings and pass it to ISV::CreateViewWindow /* member to get the current settings and pass it to ISV::CreateViewWindow */
// to allow the next folder view "inherit" it. These settings assumes a /* to allow the next folder view "inherit" it. These settings assumes a */
// particular UI (which the shell's folder view has), and shell extensions /* particular UI (which the shell's folder view has), and shell extensions */
// may or may not use those settings. /* may or may not use those settings. */
// /* */
//-------------------------------------------------------------------------- /*-------------------------------------------------------------------------- */
typedef LPBYTE LPVIEWSETTINGS; typedef LPBYTE LPVIEWSETTINGS;
// NB Bitfields. /* NB Bitfields. */
// FWF_DESKTOP implies FWF_TRANSPARENT/NOCLIENTEDGE/NOSCROLL /* FWF_DESKTOP implies FWF_TRANSPARENT/NOCLIENTEDGE/NOSCROLL */
typedef enum typedef enum
{ FWF_AUTOARRANGE = 0x0001, { FWF_AUTOARRANGE = 0x0001,
FWF_ABBREVIATEDNAMES = 0x0002, FWF_ABBREVIATEDNAMES = 0x0002,
@ -551,7 +551,7 @@ typedef enum
FWF_NOCLIENTEDGE = 0x0200, FWF_NOCLIENTEDGE = 0x0200,
FWF_NOSCROLL = 0x0400, FWF_NOSCROLL = 0x0400,
FWF_ALIGNLEFT = 0x0800, FWF_ALIGNLEFT = 0x0800,
FWF_SINGLECLICKACTIVATE=0x8000 // TEMPORARY -- NO UI FOR THIS FWF_SINGLECLICKACTIVATE=0x8000 /* TEMPORARY -- NO UI FOR THIS */
} FOLDERFLAGS; } FOLDERFLAGS;
typedef enum typedef enum
@ -562,8 +562,8 @@ typedef enum
} FOLDERVIEWMODE; } FOLDERVIEWMODE;
typedef struct typedef struct
{ UINT32 ViewMode; // View mode (FOLDERVIEWMODE values) { UINT32 ViewMode; /* View mode (FOLDERVIEWMODE values) */
UINT32 fFlags; // View options (FOLDERFLAGS bits) UINT32 fFlags; /* View options (FOLDERFLAGS bits) */
} FOLDERSETTINGS, *LPFOLDERSETTINGS; } FOLDERSETTINGS, *LPFOLDERSETTINGS;
typedef const FOLDERSETTINGS * LPCFOLDERSETTINGS; typedef const FOLDERSETTINGS * LPCFOLDERSETTINGS;
@ -703,16 +703,16 @@ DWORD WINAPI SHGetDesktopFolder(LPSHELLFOLDER *);
#define CWM_GETISHELLBROWSER (WM_USER+7) #define CWM_GETISHELLBROWSER (WM_USER+7)
typedef struct IShellBrowser_VTable typedef struct IShellBrowser_VTable
{ // *** IUnknown methods *** { /* *** IUnknown methods *** */
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// *** IOleWindow methods *** /* *** IOleWindow methods *** */
STDMETHOD(GetWindow) (THIS_ HWND32 * lphwnd) PURE; STDMETHOD(GetWindow) (THIS_ HWND32 * lphwnd) PURE;
STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL32 fEnterMode) PURE; STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL32 fEnterMode) PURE;
// *** IShellBrowser methods *** (same as IOleInPlaceFrame) /* *** IShellBrowser methods *** (same as IOleInPlaceFrame) */
STDMETHOD(InsertMenusSB) (THIS_ HMENU32 hmenuShared, LPOLEMENUGROUPWIDTHS32 lpMenuWidths) PURE; STDMETHOD(InsertMenusSB) (THIS_ HMENU32 hmenuShared, LPOLEMENUGROUPWIDTHS32 lpMenuWidths) PURE;
STDMETHOD(SetMenuSB) (THIS_ HMENU32 hmenuShared, HOLEMENU32 holemenuReserved, HWND32 hwndActiveObject) PURE; STDMETHOD(SetMenuSB) (THIS_ HMENU32 hmenuShared, HOLEMENU32 holemenuReserved, HWND32 hwndActiveObject) PURE;
STDMETHOD(RemoveMenusSB) (THIS_ HMENU32 hmenuShared) PURE; STDMETHOD(RemoveMenusSB) (THIS_ HMENU32 hmenuShared) PURE;
@ -720,7 +720,7 @@ typedef struct IShellBrowser_VTable
STDMETHOD(EnableModelessSB) (THIS_ BOOL32 fEnable) PURE; STDMETHOD(EnableModelessSB) (THIS_ BOOL32 fEnable) PURE;
STDMETHOD(TranslateAcceleratorSB) (THIS_ LPMSG32 lpmsg, WORD wID) PURE; STDMETHOD(TranslateAcceleratorSB) (THIS_ LPMSG32 lpmsg, WORD wID) PURE;
// *** IShellBrowser methods *** /* *** IShellBrowser methods *** */
STDMETHOD(BrowseObject)(THIS_ LPCITEMIDLIST pidl, UINT32 wFlags) PURE; STDMETHOD(BrowseObject)(THIS_ LPCITEMIDLIST pidl, UINT32 wFlags) PURE;
STDMETHOD(GetViewStateStream)(THIS_ DWORD grfMode, LPSTREAM32 *ppStrm) PURE; STDMETHOD(GetViewStateStream)(THIS_ DWORD grfMode, LPSTREAM32 *ppStrm) PURE;
STDMETHOD(GetControlWindow)(THIS_ UINT32 id, HWND32 * lphwnd) PURE; STDMETHOD(GetControlWindow)(THIS_ UINT32 id, HWND32 * lphwnd) PURE;
@ -745,7 +745,7 @@ struct tagSHELLBROWSER
/* shellview select item flags*/ /* shellview select item flags*/
#define SVSI_DESELECT 0x0000 #define SVSI_DESELECT 0x0000
#define SVSI_SELECT 0x0001 #define SVSI_SELECT 0x0001
#define SVSI_EDIT 0x0003 // includes select #define SVSI_EDIT 0x0003 /* includes select */
#define SVSI_DESELECTOTHERS 0x0004 #define SVSI_DESELECTOTHERS 0x0004
#define SVSI_ENSUREVISIBLE 0x0008 #define SVSI_ENSUREVISIBLE 0x0008
#define SVSI_FOCUSED 0x0010 #define SVSI_FOCUSED 0x0010
@ -819,22 +819,22 @@ typedef enum
{ SVUIA_DEACTIVATE = 0, { SVUIA_DEACTIVATE = 0,
SVUIA_ACTIVATE_NOFOCUS = 1, SVUIA_ACTIVATE_NOFOCUS = 1,
SVUIA_ACTIVATE_FOCUS = 2, SVUIA_ACTIVATE_FOCUS = 2,
SVUIA_INPLACEACTIVATE = 3 // new flag for IShellView2 SVUIA_INPLACEACTIVATE = 3 /* new flag for IShellView2 */
} SVUIA_STATUS; } SVUIA_STATUS;
typedef struct IShellView_VTable typedef struct IShellView_VTable
{ // *** IUnknown methods *** { /* *** IUnknown methods *** */
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE;
// *** IOleWindow methods *** /* *** IOleWindow methods *** */
STDMETHOD(GetWindow) (THIS_ HWND32 * lphwnd) PURE; STDMETHOD(GetWindow) (THIS_ HWND32 * lphwnd) PURE;
STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL32 fEnterMode) PURE; STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL32 fEnterMode) PURE;
// *** IShellView methods *** /* *** IShellView methods *** */
STDMETHOD(TranslateAccelerator) (THIS_ LPMSG32 lpmsg) PURE; STDMETHOD(TranslateAccelerator) (THIS_ LPMSG32 lpmsg) PURE;
STDMETHOD(EnableModeless) (THIS_ BOOL32 fEnable) PURE; STDMETHOD(EnableModeless) (THIS_ BOOL32 fEnable) PURE;
STDMETHOD(UIActivate) (THIS_ UINT32 uState) PURE; STDMETHOD(UIActivate) (THIS_ UINT32 uState) PURE;
@ -1022,16 +1022,16 @@ struct IShellLinkW {
#define THIS LPEXTRACTICON this #define THIS LPEXTRACTICON this
/* GetIconLocation() input flags*/ /* GetIconLocation() input flags*/
#define GIL_OPENICON 0x0001 // allows containers to specify an "open" look #define GIL_OPENICON 0x0001 /* allows containers to specify an "open" look */
#define GIL_FORSHELL 0x0002 // icon is to be displayed in a ShellFolder #define GIL_FORSHELL 0x0002 /* icon is to be displayed in a ShellFolder */
#define GIL_ASYNC 0x0020 // this is an async extract, return E_ASYNC #define GIL_ASYNC 0x0020 /* this is an async extract, return E_ASYNC */
/* GetIconLocation() return flags */ /* GetIconLocation() return flags */
#define GIL_SIMULATEDOC 0x0001 // simulate this document icon for this #define GIL_SIMULATEDOC 0x0001 /* simulate this document icon for this */
#define GIL_PERINSTANCE 0x0002 // icons from this class are per instance (each file has its own) #define GIL_PERINSTANCE 0x0002 /* icons from this class are per instance (each file has its own) */
#define GIL_PERCLASS 0x0004 // icons from this class per class (shared for all files of this type) #define GIL_PERCLASS 0x0004 /* icons from this class per class (shared for all files of this type) */
#define GIL_NOTFILENAME 0x0008 // location is not a filename, must call ::ExtractIcon #define GIL_NOTFILENAME 0x0008 /* location is not a filename, must call ::ExtractIcon */
#define GIL_DONTCACHE 0x0010 // this icon should not be cached #define GIL_DONTCACHE 0x0010 /* this icon should not be cached */
typedef struct IExtractIcon IExtractIcon,*LPEXTRACTICON; typedef struct IExtractIcon IExtractIcon,*LPEXTRACTICON;
typedef struct IExtractIcon_VTable typedef struct IExtractIcon_VTable
@ -1127,10 +1127,10 @@ struct tagSERVICEPROVIDER
/**************************************************************************** /****************************************************************************
* Shell Execute API * Shell Execute API
*/ */
#define SE_ERR_FNF 2 // file not found #define SE_ERR_FNF 2 /* file not found */
#define SE_ERR_PNF 3 // path not found #define SE_ERR_PNF 3 /* path not found */
#define SE_ERR_ACCESSDENIED 5 // access denied #define SE_ERR_ACCESSDENIED 5 /* access denied */
#define SE_ERR_OOM 8 // out of memory #define SE_ERR_OOM 8 /* out of memory */
#define SE_ERR_DLLNOTFOUND 32 #define SE_ERR_DLLNOTFOUND 32
#define SE_ERR_SHARE 26 #define SE_ERR_SHARE 26
#define SE_ERR_ASSOCINCOMPLETE 27 #define SE_ERR_ASSOCINCOMPLETE 27
@ -1243,7 +1243,7 @@ typedef struct tagBROWSEINFO32W {
#define PBROWSEINFO WINELIB_NAME_AW(PBROWSEINFO) #define PBROWSEINFO WINELIB_NAME_AW(PBROWSEINFO)
#define LPBROWSEINFO WINELIB_NAME_AW(LPBROWSEINFO) #define LPBROWSEINFO WINELIB_NAME_AW(LPBROWSEINFO)
// Browsing for directory. /* Browsing for directory. */
#define BIF_RETURNONLYFSDIRS 0x0001 #define BIF_RETURNONLYFSDIRS 0x0001
#define BIF_DONTGOBELOWDOMAIN 0x0002 #define BIF_DONTGOBELOWDOMAIN 0x0002
#define BIF_STATUSTEXT 0x0004 #define BIF_STATUSTEXT 0x0004
@ -1255,13 +1255,13 @@ typedef struct tagBROWSEINFO32W {
#define BIF_BROWSEFORPRINTER 0x2000 #define BIF_BROWSEFORPRINTER 0x2000
#define BIF_BROWSEINCLUDEFILES 0x4000 #define BIF_BROWSEINCLUDEFILES 0x4000
// message from browser /* message from browser */
#define BFFM_INITIALIZED 1 #define BFFM_INITIALIZED 1
#define BFFM_SELCHANGED 2 #define BFFM_SELCHANGED 2
#define BFFM_VALIDATEFAILEDA 3 // lParam:szPath ret:1(cont),0(EndDialog) #define BFFM_VALIDATEFAILEDA 3 /* lParam:szPath ret:1(cont),0(EndDialog) */
#define BFFM_VALIDATEFAILEDW 4 // lParam:wzPath ret:1(cont),0(EndDialog) #define BFFM_VALIDATEFAILEDW 4 /* lParam:wzPath ret:1(cont),0(EndDialog) */
// messages to browser /* messages to browser */
#define BFFM_SETSTATUSTEXTA (WM_USER+100) #define BFFM_SETSTATUSTEXTA (WM_USER+100)
#define BFFM_ENABLEOK (WM_USER+101) #define BFFM_ENABLEOK (WM_USER+101)
#define BFFM_SETSELECTIONA (WM_USER+102) #define BFFM_SETSELECTIONA (WM_USER+102)
@ -1314,14 +1314,14 @@ typedef HRESULT(CALLBACK *SHELLVIEWPROC)(DWORD dwUserParam,LPSHELLFOLDER psf,
#define NF_INHERITVIEW 0x0000 #define NF_INHERITVIEW 0x0000
#define NF_LOCALVIEW 0x0001 #define NF_LOCALVIEW 0x0001
typedef struct _SHELLVIEWDATA // idl typedef struct _SHELLVIEWDATA /* idl */
{ DWORD dwSize; { DWORD dwSize;
LPSHELLFOLDER pShellFolder; LPSHELLFOLDER pShellFolder;
DWORD dwUserParam; DWORD dwUserParam;
LPCITEMIDLIST pidl; LPCITEMIDLIST pidl;
DWORD v3; // always 0 DWORD v3; /* always 0 */
SHELLVIEWPROC pCallBack; SHELLVIEWPROC pCallBack;
DWORD viewmode; // NF_* enum DWORD viewmode; /* NF_* enum */
} SHELLVIEWDATA, * LPSHELLVIEWDATA; } SHELLVIEWDATA, * LPSHELLVIEWDATA;
/* /*

6
include/vfw.h
View File

@ -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);

8
include/winerror.h
View File

@ -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

30
include/winioctl.h
View File

@ -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.

10
misc/main.c
View File

@ -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)
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 )

4
multimedia/audio.c
View File

@ -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)
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;

254
multimedia/dsound.c
View File

@ -107,7 +107,7 @@ static void _dump_DSBCAPS(DWORD xmask) {
* IDirectSound3DBuffer * IDirectSound3DBuffer
*/ */
// IUnknown methods /* IUnknown methods */
static HRESULT WINAPI IDirectSound3DBuffer_QueryInterface( static HRESULT WINAPI IDirectSound3DBuffer_QueryInterface(
LPDIRECTSOUND3DBUFFER this, REFIID riid, LPVOID *ppobj) LPDIRECTSOUND3DBUFFER this, REFIID riid, LPVOID *ppobj)
{ {
@ -135,7 +135,7 @@ static ULONG WINAPI IDirectSound3DBuffer_Release(LPDIRECTSOUND3DBUFFER this)
return 0; return 0;
} }
// IDirectSound3DBuffer methods /* IDirectSound3DBuffer methods */
static HRESULT WINAPI IDirectSound3DBuffer_GetAllParameters( static HRESULT WINAPI IDirectSound3DBuffer_GetAllParameters(
LPDIRECTSOUND3DBUFFER this, LPDIRECTSOUND3DBUFFER this,
LPDS3DBUFFER lpDs3dBuffer) LPDS3DBUFFER lpDs3dBuffer)
@ -293,11 +293,11 @@ static HRESULT WINAPI IDirectSound3DBuffer_SetVelocity(
} }
IDirectSound3DBuffer_VTable ds3dbvt = { IDirectSound3DBuffer_VTable ds3dbvt = {
// IUnknown methods /* IUnknown methods */
IDirectSound3DBuffer_QueryInterface, IDirectSound3DBuffer_QueryInterface,
IDirectSound3DBuffer_AddRef, IDirectSound3DBuffer_AddRef,
IDirectSound3DBuffer_Release, IDirectSound3DBuffer_Release,
// IDirectSound3DBuffer methods /* IDirectSound3DBuffer methods */
IDirectSound3DBuffer_GetAllParameters, IDirectSound3DBuffer_GetAllParameters,
IDirectSound3DBuffer_GetConeAngles, IDirectSound3DBuffer_GetConeAngles,
IDirectSound3DBuffer_GetConeOrientation, IDirectSound3DBuffer_GetConeOrientation,
@ -325,9 +325,9 @@ static int DSOUND_Create3DBuffer(LPDIRECTSOUNDBUFFER dsb)
LPBYTE bIbuf, bObuf, bTbuf = NULL; LPBYTE bIbuf, bObuf, bTbuf = NULL;
LPWORD wIbuf, wObuf, wTbuf = NULL; LPWORD wIbuf, wObuf, wTbuf = NULL;
// Inside DirectX says it's stupid but allowed /* Inside DirectX says it's stupid but allowed */
if (dsb->wfx.nChannels == 2) { if (dsb->wfx.nChannels == 2) {
// Convert to mono /* Convert to mono */
if (dsb->wfx.wBitsPerSample == 16) { if (dsb->wfx.wBitsPerSample == 16) {
iSize = dsb->buflen / 4; iSize = dsb->buflen / 4;
wTbuf = malloc(dsb->buflen / 2); wTbuf = malloc(dsb->buflen / 2);
@ -363,7 +363,7 @@ static int DSOUND_Create3DBuffer(LPDIRECTSOUNDBUFFER dsb)
oSize = dsb->ds3db->buflen; oSize = dsb->ds3db->buflen;
} }
offset = primarybuf->wfx.nSamplesPerSec / 100; // 10ms offset = primarybuf->wfx.nSamplesPerSec / 100; /* 10ms */
if (primarybuf->wfx.wBitsPerSample == 16 && dsb->wfx.wBitsPerSample == 16) if (primarybuf->wfx.wBitsPerSample == 16 && dsb->wfx.wBitsPerSample == 16)
for (i = 0; i < iSize; i++) { for (i = 0; i < iSize; i++) {
temp = wIbuf[i]; temp = wIbuf[i];
@ -397,7 +397,7 @@ static int DSOUND_Create3DBuffer(LPDIRECTSOUNDBUFFER dsb)
* IDirectSound3DListener * IDirectSound3DListener
*/ */
// IUnknown methods /* IUnknown methods */
static HRESULT WINAPI IDirectSound3DListener_QueryInterface( static HRESULT WINAPI IDirectSound3DListener_QueryInterface(
LPDIRECTSOUND3DLISTENER this, REFIID riid, LPVOID *ppobj) LPDIRECTSOUND3DLISTENER this, REFIID riid, LPVOID *ppobj)
{ {
@ -420,7 +420,7 @@ static ULONG WINAPI IDirectSound3DListener_Release(LPDIRECTSOUND3DLISTENER this)
return this->ref; return this->ref;
} }
// IDirectSound3DListener methods /* IDirectSound3DListener methods */
static HRESULT WINAPI IDirectSound3DListener_GetAllParameter( static HRESULT WINAPI IDirectSound3DListener_GetAllParameter(
LPDIRECTSOUND3DLISTENER this, LPDIRECTSOUND3DLISTENER this,
LPDS3DLISTENER lpDS3DL) LPDS3DLISTENER lpDS3DL)
@ -551,11 +551,11 @@ static HRESULT WINAPI IDirectSound3DListener_CommitDeferredSettings(
} }
IDirectSound3DListener_VTable ds3dlvt = { IDirectSound3DListener_VTable ds3dlvt = {
// IUnknown methods /* IUnknown methods */
IDirectSound3DListener_QueryInterface, IDirectSound3DListener_QueryInterface,
IDirectSound3DListener_AddRef, IDirectSound3DListener_AddRef,
IDirectSound3DListener_Release, IDirectSound3DListener_Release,
// IDirectSound3DListener methods /* IDirectSound3DListener methods */
IDirectSound3DListener_GetAllParameter, IDirectSound3DListener_GetAllParameter,
IDirectSound3DListener_GetDistanceFactor, IDirectSound3DListener_GetDistanceFactor,
IDirectSound3DListener_GetDopplerFactor, IDirectSound3DListener_GetDopplerFactor,
@ -632,15 +632,15 @@ IDirectSoundNotify_VTable dsnvt = {
* IDirectSoundBuffer * IDirectSoundBuffer
*/ */
// This sets this format for the <em>Primary Buffer Only</em> /* This sets this format for the <em>Primary Buffer Only</em> */
// See file:///cdrom/sdk52/docs/worddoc/dsound.doc page 120 /* See file:///cdrom/sdk52/docs/worddoc/dsound.doc page 120 */
static HRESULT WINAPI IDirectSoundBuffer_SetFormat( static HRESULT WINAPI IDirectSoundBuffer_SetFormat(
LPDIRECTSOUNDBUFFER this,LPWAVEFORMATEX wfex LPDIRECTSOUNDBUFFER this,LPWAVEFORMATEX wfex
) { ) {
LPDIRECTSOUNDBUFFER *dsb; LPDIRECTSOUNDBUFFER *dsb;
int i; int i;
// Let's be pedantic! /* Let's be pedantic! */
if ((wfex == NULL) || if ((wfex == NULL) ||
(wfex->wFormatTag != WAVE_FORMAT_PCM) || (wfex->wFormatTag != WAVE_FORMAT_PCM) ||
(wfex->nChannels < 1) || (wfex->nChannels > 2) || (wfex->nChannels < 1) || (wfex->nChannels > 2) ||
@ -651,20 +651,20 @@ static HRESULT WINAPI IDirectSoundBuffer_SetFormat(
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
// **** /* **** */
EnterCriticalSection(&(primarybuf->lock)); EnterCriticalSection(&(primarybuf->lock));
if (primarybuf->wfx.nSamplesPerSec != wfex->nSamplesPerSec) { if (primarybuf->wfx.nSamplesPerSec != wfex->nSamplesPerSec) {
dsb = dsound->buffers; dsb = dsound->buffers;
for (i = 0; i < dsound->nrofbuffers; i++, dsb++) { for (i = 0; i < dsound->nrofbuffers; i++, dsb++) {
// **** /* **** */
EnterCriticalSection(&((*dsb)->lock)); EnterCriticalSection(&((*dsb)->lock));
(*dsb)->freqAdjust = ((*dsb)->freq << DSOUND_FREQSHIFT) / (*dsb)->freqAdjust = ((*dsb)->freq << DSOUND_FREQSHIFT) /
wfex->nSamplesPerSec; wfex->nSamplesPerSec;
LeaveCriticalSection(&((*dsb)->lock)); LeaveCriticalSection(&((*dsb)->lock));
// **** /* **** */
} }
} }
@ -682,7 +682,7 @@ static HRESULT WINAPI IDirectSoundBuffer_SetFormat(
DSOUND_CloseAudio(); DSOUND_CloseAudio();
LeaveCriticalSection(&(primarybuf->lock)); LeaveCriticalSection(&(primarybuf->lock));
// **** /* **** */
return DS_OK; return DS_OK;
} }
@ -694,22 +694,22 @@ static HRESULT WINAPI IDirectSoundBuffer_SetVolume(
TRACE(dsound,"(%p,%ld)\n",this,vol); TRACE(dsound,"(%p,%ld)\n",this,vol);
// I'm not sure if we need this for primary buffer /* I'm not sure if we need this for primary buffer */
if (!(this->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) if (!(this->dsbd.dwFlags & DSBCAPS_CTRLVOLUME))
return DSERR_CONTROLUNAVAIL; return DSERR_CONTROLUNAVAIL;
if ((vol > DSBVOLUME_MAX) || (vol < DSBVOLUME_MIN)) if ((vol > DSBVOLUME_MAX) || (vol < DSBVOLUME_MIN))
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
// This needs to adjust the soundcard volume when /* This needs to adjust the soundcard volume when */
// called for the primary buffer /* called for the primary buffer */
if (this->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER) { if (this->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER) {
FIXME(dsound, "Volume control of primary unimplemented.\n"); FIXME(dsound, "Volume control of primary unimplemented.\n");
this->volume = vol; this->volume = vol;
return DS_OK; return DS_OK;
} }
// **** /* **** */
EnterCriticalSection(&(this->lock)); EnterCriticalSection(&(this->lock));
this->volume = vol; this->volume = vol;
@ -720,7 +720,7 @@ static HRESULT WINAPI IDirectSoundBuffer_SetVolume(
this->rVolAdjust = (ULONG) (pow(2.0, temp / 600.0) * 32768.0); this->rVolAdjust = (ULONG) (pow(2.0, temp / 600.0) * 32768.0);
LeaveCriticalSection(&(this->lock)); LeaveCriticalSection(&(this->lock));
// **** /* **** */
TRACE(dsound, "left = %lx, right = %lx\n", this->lVolAdjust, this->rVolAdjust); TRACE(dsound, "left = %lx, right = %lx\n", this->lVolAdjust, this->rVolAdjust);
@ -744,7 +744,7 @@ static HRESULT WINAPI IDirectSoundBuffer_SetFrequency(
) { ) {
TRACE(dsound,"(%p,%ld)\n",this,freq); TRACE(dsound,"(%p,%ld)\n",this,freq);
// You cannot set the frequency of the primary buffer /* You cannot set the frequency of the primary buffer */
if (!(this->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY) || if (!(this->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY) ||
(this->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER)) (this->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER))
return DSERR_CONTROLUNAVAIL; return DSERR_CONTROLUNAVAIL;
@ -752,7 +752,7 @@ static HRESULT WINAPI IDirectSoundBuffer_SetFrequency(
if ((freq < DSBFREQUENCY_MIN) || (freq > DSBFREQUENCY_MAX)) if ((freq < DSBFREQUENCY_MIN) || (freq > DSBFREQUENCY_MAX))
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
// **** /* **** */
EnterCriticalSection(&(this->lock)); EnterCriticalSection(&(this->lock));
this->freq = freq; this->freq = freq;
@ -760,7 +760,7 @@ static HRESULT WINAPI IDirectSoundBuffer_SetFrequency(
this->nAvgBytesPerSec = freq * this->wfx.nBlockAlign; this->nAvgBytesPerSec = freq * this->wfx.nBlockAlign;
LeaveCriticalSection(&(this->lock)); LeaveCriticalSection(&(this->lock));
// **** /* **** */
return DS_OK; return DS_OK;
} }
@ -780,27 +780,27 @@ static HRESULT WINAPI IDirectSoundBuffer_Stop(LPDIRECTSOUNDBUFFER this)
{ {
TRACE(dsound,"(%p)\n",this); TRACE(dsound,"(%p)\n",this);
// **** /* **** */
EnterCriticalSection(&(this->lock)); EnterCriticalSection(&(this->lock));
this->playing = 0; this->playing = 0;
DSOUND_CheckEvent(this, 0); DSOUND_CheckEvent(this, 0);
LeaveCriticalSection(&(this->lock)); LeaveCriticalSection(&(this->lock));
// **** /* **** */
return DS_OK; return DS_OK;
} }
static DWORD WINAPI IDirectSoundBuffer_AddRef(LPDIRECTSOUNDBUFFER this) { static DWORD WINAPI IDirectSoundBuffer_AddRef(LPDIRECTSOUNDBUFFER this) {
// TRACE(dsound,"(%p) ref was %ld\n",this, this->ref); /* TRACE(dsound,"(%p) ref was %ld\n",this, this->ref); */
return ++(this->ref); return ++(this->ref);
} }
static DWORD WINAPI IDirectSoundBuffer_Release(LPDIRECTSOUNDBUFFER this) { static DWORD WINAPI IDirectSoundBuffer_Release(LPDIRECTSOUNDBUFFER this) {
int i; int i;
// TRACE(dsound,"(%p) ref was %ld\n",this, this->ref); /* TRACE(dsound,"(%p) ref was %ld\n",this, this->ref); */
if (--this->ref) if (--this->ref)
return this->ref; return this->ref;
@ -864,7 +864,7 @@ static HRESULT WINAPI IDirectSoundBuffer_GetFormat(
if (wfsize>sizeof(this->wfx)) if (wfsize>sizeof(this->wfx))
wfsize = sizeof(this->wfx); wfsize = sizeof(this->wfx);
if (lpwf) { // NULL is valid if (lpwf) { /* NULL is valid */
memcpy(lpwf,&(this->wfx),wfsize); memcpy(lpwf,&(this->wfx),wfsize);
if (wfwritten) if (wfwritten)
*wfwritten = wfsize; *wfwritten = wfsize;
@ -917,8 +917,8 @@ static HRESULT WINAPI IDirectSoundBuffer_Lock(
*audiobytes2 = writebytes-(this->buflen-writecursor); *audiobytes2 = writebytes-(this->buflen-writecursor);
TRACE(dsound,"->%ld.%ld\n",*audiobytes1,audiobytes2?*audiobytes2:0); TRACE(dsound,"->%ld.%ld\n",*audiobytes1,audiobytes2?*audiobytes2:0);
} }
// No. See file:///cdrom/sdk52/docs/worddoc/dsound.doc page 21 /* No. See file:///cdrom/sdk52/docs/worddoc/dsound.doc page 21 */
// this->writepos=(writecursor+writebytes)%this->buflen; /* this->writepos=(writecursor+writebytes)%this->buflen; */
return DS_OK; return DS_OK;
} }
@ -927,13 +927,13 @@ static HRESULT WINAPI IDirectSoundBuffer_SetCurrentPosition(
) { ) {
TRACE(dsound,"(%p,%ld)\n",this,newpos); TRACE(dsound,"(%p,%ld)\n",this,newpos);
// **** /* **** */
EnterCriticalSection(&(this->lock)); EnterCriticalSection(&(this->lock));
this->playpos = newpos; this->playpos = newpos;
LeaveCriticalSection(&(this->lock)); LeaveCriticalSection(&(this->lock));
// **** /* **** */
return 0; return 0;
} }
@ -948,14 +948,14 @@ static HRESULT WINAPI IDirectSoundBuffer_SetPan(
if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT)) if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT))
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
// You cannot set the pan of the primary buffer /* You cannot set the pan of the primary buffer */
// and you cannot use both pan and 3D controls /* and you cannot use both pan and 3D controls */
if (!(this->dsbd.dwFlags & DSBCAPS_CTRLPAN) || if (!(this->dsbd.dwFlags & DSBCAPS_CTRLPAN) ||
(this->dsbd.dwFlags & DSBCAPS_CTRL3D) || (this->dsbd.dwFlags & DSBCAPS_CTRL3D) ||
(this->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER)) (this->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER))
return DSERR_CONTROLUNAVAIL; return DSERR_CONTROLUNAVAIL;
// **** /* **** */
EnterCriticalSection(&(this->lock)); EnterCriticalSection(&(this->lock));
this->pan = pan; this->pan = pan;
@ -966,7 +966,7 @@ static HRESULT WINAPI IDirectSoundBuffer_SetPan(
this->rVolAdjust = (ULONG) (pow(2.0, temp / 600.0) * 32768.0); this->rVolAdjust = (ULONG) (pow(2.0, temp / 600.0) * 32768.0);
LeaveCriticalSection(&(this->lock)); LeaveCriticalSection(&(this->lock));
// **** /* **** */
return DS_OK; return DS_OK;
} }
@ -989,16 +989,16 @@ static HRESULT WINAPI IDirectSoundBuffer_Unlock(
) { ) {
TRACE(dsound,"(%p,%p,%ld,%p,%ld):stub\n", this,p1,x1,p2,x2); TRACE(dsound,"(%p,%p,%ld,%p,%ld):stub\n", this,p1,x1,p2,x2);
// There is really nothing to do here. Should someone /* There is really nothing to do here. Should someone */
// choose to implement static buffers in hardware (by /* choose to implement static buffers in hardware (by */
// using a wave table synth, for example) this is where /* using a wave table synth, for example) this is where */
// you'd want to do the loading. For software buffers, /* you'd want to do the loading. For software buffers, */
// which is what we currently use, we need do nothing. /* which is what we currently use, we need do nothing. */
#if 0 #if 0
// It's also the place to pre-process 3D buffers... /* It's also the place to pre-process 3D buffers... */
// This is highly experimental and liable to break things /* This is highly experimental and liable to break things */
if (this->dsbd.dwFlags & DSBCAPS_CTRL3D) if (this->dsbd.dwFlags & DSBCAPS_CTRL3D)
DSOUND_Create3DBuffer(this); DSOUND_Create3DBuffer(this);
#endif #endif
@ -1035,8 +1035,8 @@ static HRESULT WINAPI IDirectSoundBuffer_GetCaps(
if (caps == NULL) if (caps == NULL)
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
// I think we should check this value, not set it. See /* I think we should check this value, not set it. See */
// Inside DirectX, p215. That should apply here, too. /* Inside DirectX, p215. That should apply here, too. */
caps->dwSize = sizeof(*caps); caps->dwSize = sizeof(*caps);
caps->dwFlags = this->dsbd.dwFlags | DSBCAPS_LOCSOFTWARE; caps->dwFlags = this->dsbd.dwFlags | DSBCAPS_LOCSOFTWARE;
@ -1145,7 +1145,7 @@ static HRESULT WINAPI IDirectSound_CreateSoundBuffer(
primarybuf->lpvtbl->fnAddRef(primarybuf); primarybuf->lpvtbl->fnAddRef(primarybuf);
*ppdsb = primarybuf; *ppdsb = primarybuf;
return DS_OK; return DS_OK;
} // Else create primarybuf } /* Else create primarybuf */
} }
*ppdsb = (LPDIRECTSOUNDBUFFER)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectSoundBuffer)); *ppdsb = (LPDIRECTSOUNDBUFFER)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectSoundBuffer));
@ -1168,8 +1168,8 @@ static HRESULT WINAPI IDirectSound_CreateSoundBuffer(
*ppdsb = NULL; *ppdsb = NULL;
return DSERR_OUTOFMEMORY; return DSERR_OUTOFMEMORY;
} }
// It's not necessary to initialize values to zero since /* It's not necessary to initialize values to zero since */
// we allocated this structure with HEAP_ZERO_MEMORY... /* we allocated this structure with HEAP_ZERO_MEMORY... */
(*ppdsb)->playpos = 0; (*ppdsb)->playpos = 0;
(*ppdsb)->writepos = 0; (*ppdsb)->writepos = 0;
(*ppdsb)->lpvtbl = &dsbvt; (*ppdsb)->lpvtbl = &dsbvt;
@ -1270,7 +1270,7 @@ static HRESULT WINAPI IDirectSound_GetCaps(LPDIRECTSOUND this,LPDSCAPS caps) {
if (caps == NULL) if (caps == NULL)
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
// We should check this value, not set it. See Inside DirectX, p215. /* We should check this value, not set it. See Inside DirectX, p215. */
caps->dwSize = sizeof(*caps); caps->dwSize = sizeof(*caps);
caps->dwFlags = caps->dwFlags =
@ -1307,9 +1307,9 @@ static HRESULT WINAPI IDirectSound_GetCaps(LPDIRECTSOUND this,LPDSCAPS caps) {
caps->dwMaxContigFreeHwMemBytes = 0; caps->dwMaxContigFreeHwMemBytes = 0;
caps->dwUnlockTransferRateHwBuffers = 4096; // But we have none... caps->dwUnlockTransferRateHwBuffers = 4096; /* But we have none... */
caps->dwPlayCpuOverheadSwBuffers = 1; // 1% caps->dwPlayCpuOverheadSwBuffers = 1; /* 1% */
return 0; return 0;
} }
@ -1322,7 +1322,7 @@ static ULONG WINAPI IDirectSound_Release(LPDIRECTSOUND this) {
TRACE(dsound,"(%p), ref was %ld\n",this,this->ref); TRACE(dsound,"(%p), ref was %ld\n",this,this->ref);
if (!--(this->ref)) { if (!--(this->ref)) {
DSOUND_CloseAudio(); DSOUND_CloseAudio();
while(IDirectSoundBuffer_Release(primarybuf)); // Deallocate while(IDirectSoundBuffer_Release(primarybuf)); /* Deallocate */
FIXME(dsound, "need to release all buffers!\n"); FIXME(dsound, "need to release all buffers!\n");
HeapFree(GetProcessHeap(),0,this); HeapFree(GetProcessHeap(),0,this);
dsound = NULL; dsound = NULL;
@ -1487,11 +1487,11 @@ static void DSOUND_CheckEvent(IDirectSoundBuffer *dsb, int len)
offset = event->dwOffset; offset = event->dwOffset;
TRACE(dsound, "checking %d, position %ld, event = %d\n", TRACE(dsound, "checking %d, position %ld, event = %d\n",
i, offset, event->hEventNotify); i, offset, event->hEventNotify);
// DSBPN_OFFSETSTOP has to be the last element. So this is /* DSBPN_OFFSETSTOP has to be the last element. So this is */
// OK. [Inside DirectX, p274] /* OK. [Inside DirectX, p274] */
// /* */
// This also means we can't sort the entries by offset, /* This also means we can't sort the entries by offset, */
// because DSBPN_OFFSETSTOP == -1 /* because DSBPN_OFFSETSTOP == -1 */
if (offset == DSBPN_OFFSETSTOP) { if (offset == DSBPN_OFFSETSTOP) {
if (dsb->playing == 0) { if (dsb->playing == 0) {
SetEvent(event->hEventNotify); SetEvent(event->hEventNotify);
@ -1515,15 +1515,15 @@ static void DSOUND_CheckEvent(IDirectSoundBuffer *dsb, int len)
} }
} }
// WAV format info can be found at: /* WAV format info can be found at: */
// /* */
// http://www.cwi.nl/ftp/audio/AudioFormats.part2 /* http://www.cwi.nl/ftp/audio/AudioFormats.part2 */
// ftp://ftp.cwi.nl/pub/audio/RIFF-format /* ftp://ftp.cwi.nl/pub/audio/RIFF-format */
// /* */
// Import points to remember: /* Import points to remember: */
// /* */
// 8-bit WAV is unsigned /* 8-bit WAV is unsigned */
// 16-bit WAV is signed /* 16-bit WAV is signed */
static inline INT16 cvtU8toS16(BYTE byte) static inline INT16 cvtU8toS16(BYTE byte)
{ {
@ -1540,14 +1540,14 @@ static inline BYTE cvtS16toU8(INT16 word)
} }
// We should be able to optimize these two inline functions /* We should be able to optimize these two inline functions */
// so that we aren't doing 8->16->8 conversions when it is /* so that we aren't doing 8->16->8 conversions when it is */
// not necessary. But this is still a WIP. Optimize later. /* not necessary. But this is still a WIP. Optimize later. */
static inline void get_fields(const IDirectSoundBuffer *dsb, BYTE *buf, INT32 *fl, INT32 *fr) static inline void get_fields(const IDirectSoundBuffer *dsb, BYTE *buf, INT32 *fl, INT32 *fr)
{ {
INT16 *bufs = (INT16 *) buf; INT16 *bufs = (INT16 *) buf;
// TRACE(dsound, "(%p)", buf); /* TRACE(dsound, "(%p)", buf); */
if ((dsb->wfx.wBitsPerSample == 8) && dsb->wfx.nChannels == 2) { if ((dsb->wfx.wBitsPerSample == 8) && dsb->wfx.nChannels == 2) {
*fl = cvtU8toS16(*buf); *fl = cvtU8toS16(*buf);
*fr = cvtU8toS16(*(buf + 1)); *fr = cvtU8toS16(*(buf + 1));
@ -1605,7 +1605,7 @@ static inline void set_fields(BYTE *buf, INT32 fl, INT32 fr)
return; return;
} }
// Now with PerfectPitch (tm) technology /* Now with PerfectPitch (tm) technology */
static INT32 DSOUND_MixerNorm(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len) static INT32 DSOUND_MixerNorm(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
{ {
INT32 i, size, ipos, ilen, fieldL, fieldR; INT32 i, size, ipos, ilen, fieldL, fieldR;
@ -1617,14 +1617,14 @@ static INT32 DSOUND_MixerNorm(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
obp = buf; obp = buf;
TRACE(dsound, "(%p, %p, %p), playpos=%8.8lx\n", dsb, ibp, obp, dsb->playpos); TRACE(dsound, "(%p, %p, %p), playpos=%8.8lx\n", dsb, ibp, obp, dsb->playpos);
// Check for the best case /* Check for the best case */
if ((dsb->freq == primarybuf->wfx.nSamplesPerSec) && if ((dsb->freq == primarybuf->wfx.nSamplesPerSec) &&
(dsb->wfx.wBitsPerSample == primarybuf->wfx.wBitsPerSample) && (dsb->wfx.wBitsPerSample == primarybuf->wfx.wBitsPerSample) &&
(dsb->wfx.nChannels == primarybuf->wfx.nChannels)) { (dsb->wfx.nChannels == primarybuf->wfx.nChannels)) {
TRACE(dsound, "(%p) Best case\n", dsb); TRACE(dsound, "(%p) Best case\n", dsb);
if ((ibp + len) < (BYTE *)(dsb->buffer + dsb->buflen)) if ((ibp + len) < (BYTE *)(dsb->buffer + dsb->buflen))
memcpy(obp, ibp, len); memcpy(obp, ibp, len);
else { // wrap else { /* wrap */
memcpy(obp, ibp, dsb->buflen - dsb->playpos); memcpy(obp, ibp, dsb->buflen - dsb->playpos);
memcpy(obp + (dsb->buflen - dsb->playpos), memcpy(obp + (dsb->buflen - dsb->playpos),
dsb->buffer, dsb->buffer,
@ -1633,7 +1633,7 @@ static INT32 DSOUND_MixerNorm(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
return len; return len;
} }
// Check for same sample rate /* Check for same sample rate */
if (dsb->freq == primarybuf->wfx.nSamplesPerSec) { if (dsb->freq == primarybuf->wfx.nSamplesPerSec) {
TRACE(dsound, "(%p) Same sample rate %ld = primary %ld\n", dsb, TRACE(dsound, "(%p) Same sample rate %ld = primary %ld\n", dsb,
dsb->freq, primarybuf->wfx.nSamplesPerSec); dsb->freq, primarybuf->wfx.nSamplesPerSec);
@ -1645,15 +1645,15 @@ static INT32 DSOUND_MixerNorm(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
set_fields(obp, fieldL, fieldR); set_fields(obp, fieldL, fieldR);
obp += oAdvance; obp += oAdvance;
if (ibp >= (BYTE *)(dsb->buffer + dsb->buflen)) if (ibp >= (BYTE *)(dsb->buffer + dsb->buflen))
ibp = dsb->buffer; // wrap ibp = dsb->buffer; /* wrap */
} }
return (ilen); return (ilen);
} }
// Mix in different sample rates /* Mix in different sample rates */
// /* */
// New PerfectPitch(tm) Technology (c) 1998 Rob Riggs /* New PerfectPitch(tm) Technology (c) 1998 Rob Riggs */
// Patent Pending :-] /* Patent Pending :-] */
TRACE(dsound, "(%p) Adjusting frequency: %ld -> %ld\n", TRACE(dsound, "(%p) Adjusting frequency: %ld -> %ld\n",
dsb, dsb->freq, primarybuf->wfx.nSamplesPerSec); dsb, dsb->freq, primarybuf->wfx.nSamplesPerSec);
@ -1665,7 +1665,7 @@ static INT32 DSOUND_MixerNorm(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
ipos = (((i * dsb->freqAdjust) >> DSOUND_FREQSHIFT) * iAdvance) + dsb->playpos; ipos = (((i * dsb->freqAdjust) >> DSOUND_FREQSHIFT) * iAdvance) + dsb->playpos;
if (ipos >= dsb->buflen) if (ipos >= dsb->buflen)
ipos %= dsb->buflen; // wrap ipos %= dsb->buflen; /* wrap */
get_fields(dsb, (dsb->buffer + ipos), &fieldL, &fieldR); get_fields(dsb, (dsb->buffer + ipos), &fieldL, &fieldR);
set_fields(obp, fieldL, fieldR); set_fields(obp, fieldL, fieldR);
@ -1685,11 +1685,11 @@ static void DSOUND_MixerVol(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
if ((!(dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->pan == 0)) && if ((!(dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->pan == 0)) &&
(!(dsb->dsbd.dwFlags & DSBCAPS_CTRLVOLUME) || (dsb->volume == 0)) && (!(dsb->dsbd.dwFlags & DSBCAPS_CTRLVOLUME) || (dsb->volume == 0)) &&
!(dsb->dsbd.dwFlags & DSBCAPS_CTRL3D)) !(dsb->dsbd.dwFlags & DSBCAPS_CTRL3D))
return; // Nothing to do return; /* Nothing to do */
// If we end up with some bozo coder using panning or 3D sound /* If we end up with some bozo coder using panning or 3D sound */
// with a mono primary buffer, it could sound very weird using /* with a mono primary buffer, it could sound very weird using */
// this method. Oh well, tough patooties. /* this method. Oh well, tough patooties. */
for (i = 0; i < len; i += inc) { for (i = 0; i < len; i += inc) {
INT32 val; INT32 val;
@ -1697,22 +1697,22 @@ static void DSOUND_MixerVol(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
switch (inc) { switch (inc) {
case 1: case 1:
// 8-bit WAV is unsigned, but we need to operate /* 8-bit WAV is unsigned, but we need to operate */
// on signed data for this to work properly /* on signed data for this to work properly */
val = *bpc - 128; val = *bpc - 128;
val = ((val * (i & inc ? dsb->rVolAdjust : dsb->lVolAdjust)) >> 15); val = ((val * (i & inc ? dsb->rVolAdjust : dsb->lVolAdjust)) >> 15);
*bpc = val + 128; *bpc = val + 128;
bpc++; bpc++;
break; break;
case 2: case 2:
// 16-bit WAV is signed -- much better /* 16-bit WAV is signed -- much better */
val = *bps; val = *bps;
val = ((val * ((i & inc) ? dsb->rVolAdjust : dsb->lVolAdjust)) >> 15); val = ((val * ((i & inc) ? dsb->rVolAdjust : dsb->lVolAdjust)) >> 15);
*bps = val; *bps = val;
bps++; bps++;
break; break;
default: default:
// Very ugly! /* Very ugly! */
FIXME(dsound, "MixerVol had a nasty error\n"); FIXME(dsound, "MixerVol had a nasty error\n");
} }
} }
@ -1736,7 +1736,7 @@ static void DSOUND_Mixer3D(IDirectSoundBuffer *dsb, BYTE *buf, INT32 len)
if (len <= (playpos + buflen)) if (len <= (playpos + buflen))
memcpy(obp, ibp, len); memcpy(obp, ibp, len);
else { // wrap else { /* wrap */
memcpy(obp, ibp, buflen - playpos); memcpy(obp, ibp, buflen - playpos);
memcpy(obp + (buflen - playpos), memcpy(obp + (buflen - playpos),
dsb->buffer, dsb->buffer,
@ -1753,7 +1753,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBuffer *dsb)
BYTE *buf, *ibuf, *obuf; BYTE *buf, *ibuf, *obuf;
INT16 *ibufs, *obufs; INT16 *ibufs, *obufs;
len = DSOUND_FRAGLEN; // The most we will use len = DSOUND_FRAGLEN; /* The most we will use */
if (!(dsb->playflags & DSBPLAY_LOOPING)) { if (!(dsb->playflags & DSBPLAY_LOOPING)) {
temp = ((primarybuf->wfx.nAvgBytesPerSec * dsb->buflen) / temp = ((primarybuf->wfx.nAvgBytesPerSec * dsb->buflen) /
dsb->nAvgBytesPerSec) - dsb->nAvgBytesPerSec) -
@ -1761,23 +1761,23 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBuffer *dsb)
dsb->nAvgBytesPerSec); dsb->nAvgBytesPerSec);
len = (len > temp) ? temp : len; len = (len > temp) ? temp : len;
} }
len &= ~3; // 4 byte alignment len &= ~3; /* 4 byte alignment */
if (len == 0) { if (len == 0) {
// This should only happen if we aren't looping and temp < 4 /* This should only happen if we aren't looping and temp < 4 */
// We skip the remainder, so check for possible events /* We skip the remainder, so check for possible events */
DSOUND_CheckEvent(dsb, dsb->buflen - dsb->playpos); DSOUND_CheckEvent(dsb, dsb->buflen - dsb->playpos);
// Stop /* Stop */
dsb->playing = 0; dsb->playing = 0;
dsb->writepos = 0; dsb->writepos = 0;
dsb->playpos = 0; dsb->playpos = 0;
// Check for DSBPN_OFFSETSTOP /* Check for DSBPN_OFFSETSTOP */
DSOUND_CheckEvent(dsb, 0); DSOUND_CheckEvent(dsb, 0);
return 0; return 0;
} }
// Been seeing segfaults in malloc() for some reason... /* Been seeing segfaults in malloc() for some reason... */
TRACE(dsound, "allocating buffer (size = %d)\n", len); TRACE(dsound, "allocating buffer (size = %d)\n", len);
if ((buf = ibuf = (BYTE *) malloc(len)) == NULL) if ((buf = ibuf = (BYTE *) malloc(len)) == NULL)
return 0; return 0;
@ -1794,14 +1794,14 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBuffer *dsb)
obufs = (INT16 *) obuf; obufs = (INT16 *) obuf;
ibufs = (INT16 *) ibuf; ibufs = (INT16 *) ibuf;
if (primarybuf->wfx.wBitsPerSample == 8) { if (primarybuf->wfx.wBitsPerSample == 8) {
// 8-bit WAV is unsigned /* 8-bit WAV is unsigned */
field = (*ibuf - 128); field = (*ibuf - 128);
field += (*obuf - 128); field += (*obuf - 128);
field = field > 127 ? 127 : field; field = field > 127 ? 127 : field;
field = field < -128 ? -128 : field; field = field < -128 ? -128 : field;
*obuf = field + 128; *obuf = field + 128;
} else { } else {
// 16-bit WAV is signed /* 16-bit WAV is signed */
field = *ibufs; field = *ibufs;
field += *obufs; field += *obufs;
field = field > 32767 ? 32767 : field; field = field > 32767 ? 32767 : field;
@ -1826,9 +1826,9 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBuffer *dsb)
dsb->playing = 0; dsb->playing = 0;
dsb->writepos = 0; dsb->writepos = 0;
dsb->playpos = 0; dsb->playpos = 0;
DSOUND_CheckEvent(dsb, 0); // For DSBPN_OFFSETSTOP DSOUND_CheckEvent(dsb, 0); /* For DSBPN_OFFSETSTOP */
} else } else
dsb->playpos %= dsb->buflen; // wrap dsb->playpos %= dsb->buflen; /* wrap */
} }
if (dsb->writepos >= dsb->buflen) if (dsb->writepos >= dsb->buflen)
@ -1871,13 +1871,13 @@ static int DSOUND_OpenAudio(void)
sleep(5); sleep(5);
audiofd = open("/dev/audio",O_WRONLY); audiofd = open("/dev/audio",O_WRONLY);
if (audiofd==-1) { if (audiofd==-1) {
// Don't worry if sound is busy at the moment /* Don't worry if sound is busy at the moment */
if (errno != EBUSY) if (errno != EBUSY)
perror("open /dev/audio"); perror("open /dev/audio");
return audiofd; // -1 return audiofd; /* -1 */
} }
// We should probably do something here if SETFRAGMENT fails... /* We should probably do something here if SETFRAGMENT fails... */
audioFragment=0x0002000c; audioFragment=0x0002000c;
if (-1==ioctl(audiofd,SNDCTL_DSP_SETFRAGMENT,&audioFragment)) if (-1==ioctl(audiofd,SNDCTL_DSP_SETFRAGMENT,&audioFragment))
perror("ioctl SETFRAGMENT"); perror("ioctl SETFRAGMENT");
@ -1893,11 +1893,11 @@ static void DSOUND_CloseAudio(void)
int neutral; int neutral;
neutral = primarybuf->wfx.wBitsPerSample == 8 ? 128 : 0; neutral = primarybuf->wfx.wBitsPerSample == 8 ? 128 : 0;
audioOK = 0; // race condition audioOK = 0; /* race condition */
Sleep(5); Sleep(5);
// It's possible we've been called with audio closed /* It's possible we've been called with audio closed */
// from SetFormat()... this is just to force a call /* from SetFormat()... this is just to force a call */
// to OpenAudio() to reset the hardware properly /* to OpenAudio() to reset the hardware properly */
if (audiofd != -1) if (audiofd != -1)
close(audiofd); close(audiofd);
primarybuf->playpos = 0; primarybuf->playpos = 0;
@ -1928,15 +1928,15 @@ static void DSOUND_OutputPrimary(int len)
int neutral, flen1, flen2; int neutral, flen1, flen2;
char *frag1, *frag2; char *frag1, *frag2;
// This is a bad place for this. We need to clear the /* This is a bad place for this. We need to clear the */
// buffer with a neutral value, for unsigned 8-bit WAVE /* buffer with a neutral value, for unsigned 8-bit WAVE */
// that's 128, for signed 16-bit it's 0 /* that's 128, for signed 16-bit it's 0 */
neutral = primarybuf->wfx.wBitsPerSample == 8 ? 128 : 0; neutral = primarybuf->wfx.wBitsPerSample == 8 ? 128 : 0;
// **** /* **** */
EnterCriticalSection(&(primarybuf->lock)); EnterCriticalSection(&(primarybuf->lock));
// Write out the /* Write out the */
if ((audioOK == 1) || (DSOUND_OpenAudio() == 0)) { if ((audioOK == 1) || (DSOUND_OpenAudio() == 0)) {
if (primarybuf->playpos + len >= primarybuf->buflen) { if (primarybuf->playpos + len >= primarybuf->buflen) {
frag1 = primarybuf->buffer + primarybuf->playpos; frag1 = primarybuf->buffer + primarybuf->playpos;
@ -1966,9 +1966,9 @@ static void DSOUND_OutputPrimary(int len)
memset(frag1, neutral, flen1); memset(frag1, neutral, flen1);
} }
} else { } else {
// Can't play audio at the moment -- we need to sleep /* Can't play audio at the moment -- we need to sleep */
// to make up for the time we'd be blocked in write() /* to make up for the time we'd be blocked in write() */
// to /dev/audio /* to /dev/audio */
Sleep(60); Sleep(60);
} }
primarybuf->playpos += len; primarybuf->playpos += len;
@ -1979,7 +1979,7 @@ static void DSOUND_OutputPrimary(int len)
primarybuf->writepos %= primarybuf->buflen; primarybuf->writepos %= primarybuf->buflen;
LeaveCriticalSection(&(primarybuf->lock)); LeaveCriticalSection(&(primarybuf->lock));
// **** /* **** */
} }
static DWORD WINAPI DSOUND_thread(LPVOID arg) static DWORD WINAPI DSOUND_thread(LPVOID arg)
@ -1999,25 +1999,25 @@ static DWORD WINAPI DSOUND_thread(LPVOID arg)
/* RACE: dsound could be deleted */ /* RACE: dsound could be deleted */
dsound->lpvtbl->fnAddRef(dsound); dsound->lpvtbl->fnAddRef(dsound);
if (primarybuf == NULL) { if (primarybuf == NULL) {
// Should never happen /* Should never happen */
WARN(dsound, "Lost the primary buffer!\n"); WARN(dsound, "Lost the primary buffer!\n");
dsound->lpvtbl->fnRelease(dsound); dsound->lpvtbl->fnRelease(dsound);
ExitThread(0); ExitThread(0);
} }
// **** /* **** */
EnterCriticalSection(&(primarybuf->lock)); EnterCriticalSection(&(primarybuf->lock));
len = DSOUND_MixPrimary(); len = DSOUND_MixPrimary();
LeaveCriticalSection(&(primarybuf->lock)); LeaveCriticalSection(&(primarybuf->lock));
// **** /* **** */
if (primarybuf->playing) if (primarybuf->playing)
len = DSOUND_FRAGLEN > len ? DSOUND_FRAGLEN : len; len = DSOUND_FRAGLEN > len ? DSOUND_FRAGLEN : len;
if (len) { if (len) {
// This does all the work /* This does all the work */
DSOUND_OutputPrimary(len); DSOUND_OutputPrimary(len);
} else { } else {
// no buffers playing -- close and wait /* no buffers playing -- close and wait */
if (audioOK) if (audioOK)
DSOUND_CloseAudio(); DSOUND_CloseAudio();
Sleep(100); Sleep(100);
@ -2047,9 +2047,9 @@ HRESULT WINAPI DirectSoundCreate(LPGUID lpGUID,LPDIRECTSOUND *ppDS,IUnknown *pUn
return DS_OK; return DS_OK;
} }
// Check that we actually have audio capabilities /* Check that we actually have audio capabilities */
// If we do, whether it's busy or not, we continue /* If we do, whether it's busy or not, we continue */
// otherwise we return with DSERR_NODRIVER /* otherwise we return with DSERR_NODRIVER */
audiofd = open("/dev/audio",O_WRONLY); audiofd = open("/dev/audio",O_WRONLY);
if (audiofd == -1) { if (audiofd == -1) {

2
ole/ole2.c
View File

@ -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;
} }

2
programs/clock/language.c
View File

@ -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);
} }
} }

6
programs/clock/main.c
View File

@ -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) {
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)
else Idle(NULL); else Idle(NULL);
} }
// We will never reach the following statement ! /* We will never reach the following statement ! */
return 0; return 0;
} }

36
programs/notepad/dialog.c
View File

@ -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) {
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) {
} }
// Forget file name /* Forget file name */
lstrcpy(Globals.szFileName, ""); lstrcpy(Globals.szFileName, "");
LANGUAGE_UpdateWindowCaption(); LANGUAGE_UpdateWindowCaption();
@ -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) {
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)
printer.hSetupTemplate = 0; printer.hSetupTemplate = 0;
if (PrintDlg(&printer)) { if (PrintDlg(&printer)) {
// do nothing /* do nothing */
}; };
} }
@ -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)
} }
else else
{ {
// do nothing yet /* do nothing yet */
}; };
} }
@ -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;

2
programs/notepad/language.c
View File

@ -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
} }

10
programs/notepad/main.c
View File

@ -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)
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)
{ {
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);

18
rc/systest.c
View File

@ -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,
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);

2
windows/multimon.c
View File

@ -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:

8
windows/nonclient.c
View File

@ -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 )
{ {
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;
} }