diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 7b36120a36e..50a13bd529a 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -394,7 +394,7 @@ GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo) /*********************************************************************** - * DrawStatusTextW [COMCTL32.28] + * DrawStatusTextW [COMCTL32.@] * * Draws text with borders, like in a status bar. * @@ -446,7 +446,7 @@ void WINAPI DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style) /*********************************************************************** - * DrawStatusText [COMCTL32.27] + * DrawStatusText [COMCTL32.@] * DrawStatusTextA [COMCTL32.5] * * Draws text with borders, like in a status bar. @@ -478,7 +478,7 @@ void WINAPI DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style) /*********************************************************************** - * CreateStatusWindow [COMCTL32.21] + * CreateStatusWindow [COMCTL32.@] * CreateStatusWindowA [COMCTL32.6] * * Creates a status bar @@ -505,7 +505,7 @@ CreateStatusWindowA (INT style, LPCSTR text, HWND parent, UINT wid) /*********************************************************************** - * CreateStatusWindowW [COMCTL32.22] Creates a status bar control + * CreateStatusWindowW [COMCTL32.@] Creates a status bar control * * PARAMS * style [I] window style @@ -592,7 +592,7 @@ InitCommonControls (void) /*********************************************************************** - * InitCommonControlsEx [COMCTL32.84] + * InitCommonControlsEx [COMCTL32.@] * * Registers the common controls. * @@ -675,7 +675,7 @@ InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls) /*********************************************************************** - * CreateToolbarEx [COMCTL32.23] Creates a tool bar window + * CreateToolbarEx [COMCTL32.@] Creates a tool bar window * * PARAMS * hwnd @@ -896,7 +896,7 @@ CreateToolbar (HWND hwnd, DWORD style, UINT wID, INT nBitmaps, /*********************************************************************** - * DllGetVersion [COMCTL32.25] + * DllGetVersion [COMCTL32.@] * * Retrieves version information of the 'COMCTL32.DLL' * @@ -932,7 +932,7 @@ COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi) } /*********************************************************************** - * DllInstall (COMCTL32.26) + * DllInstall (COMCTL32.@) */ HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline) { @@ -943,7 +943,7 @@ HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline) } /*********************************************************************** - * _TrackMouseEvent [COMCTL32.91] + * _TrackMouseEvent [COMCTL32.@] * * Requests notification of mouse events * @@ -973,7 +973,7 @@ _TrackMouseEvent (TRACKMOUSEEVENT *ptme) } /************************************************************************* - * GetMUILanguage [COMCTL32.39] + * GetMUILanguage [COMCTL32.@] * * FIXME: What's this supposed to do? Apparently some i18n thing. * @@ -985,7 +985,7 @@ LANGID WINAPI GetMUILanguage (VOID) /************************************************************************* - * InitMUILanguage [COMCTL32.85] + * InitMUILanguage [COMCTL32.@] * * FIXME: What's this supposed to do? Apparently some i18n thing. * diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c index a8ab87d2f63..a128b3c0aac 100644 --- a/dlls/comctl32/flatsb.c +++ b/dlls/comctl32/flatsb.c @@ -46,7 +46,7 @@ typedef struct /*********************************************************************** - * InitializeFlatSB (COMCTL32.86) + * InitializeFlatSB (COMCTL32.@) * * returns nonzero if successful, zero otherwise * @@ -59,7 +59,7 @@ BOOL WINAPI InitializeFlatSB(HWND hwnd) } /*********************************************************************** - * UninitializeFlatSB (COMCTL32.90) + * UninitializeFlatSB (COMCTL32.@) * * returns: * E_FAIL if one of the scroll bars is currently in use @@ -75,7 +75,7 @@ HRESULT WINAPI UninitializeFlatSB(HWND hwnd) } /*********************************************************************** - * FlatSB_GetScrollProp (COMCTL32.32) + * FlatSB_GetScrollProp (COMCTL32.@) * * Returns nonzero if successful, or zero otherwise. If index is WSB_PROP_HSTYLE, * the return is nonzero if InitializeFlatSB has been called for this window, or @@ -91,7 +91,7 @@ FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop) } /*********************************************************************** - * FlatSB_SetScrollProp (COMCTL32.36) + * FlatSB_SetScrollProp (COMCTL32.@) */ BOOL WINAPI FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag) @@ -118,7 +118,7 @@ FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag) */ /*********************************************************************** - * FlatSB_EnableScrollBar (COMCTL32.29) + * FlatSB_EnableScrollBar (COMCTL32.@) */ BOOL WINAPI FlatSB_EnableScrollBar(HWND hwnd, int nBar, UINT flags) @@ -127,7 +127,7 @@ FlatSB_EnableScrollBar(HWND hwnd, int nBar, UINT flags) } /*********************************************************************** - * FlatSB_ShowScrollBar (COMCTL32.38) + * FlatSB_ShowScrollBar (COMCTL32.@) */ BOOL WINAPI FlatSB_ShowScrollBar(HWND hwnd, int nBar, BOOL fShow) @@ -136,7 +136,7 @@ FlatSB_ShowScrollBar(HWND hwnd, int nBar, BOOL fShow) } /*********************************************************************** - * FlatSB_GetScrollRange (COMCTL32.33) + * FlatSB_GetScrollRange (COMCTL32.@) */ BOOL WINAPI FlatSB_GetScrollRange(HWND hwnd, int nBar, LPINT min, LPINT max) @@ -145,7 +145,7 @@ FlatSB_GetScrollRange(HWND hwnd, int nBar, LPINT min, LPINT max) } /*********************************************************************** - * FlatSB_GetScrollInfo (COMCTL32.30) + * FlatSB_GetScrollInfo (COMCTL32.@) */ BOOL WINAPI FlatSB_GetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info) @@ -154,7 +154,7 @@ FlatSB_GetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info) } /*********************************************************************** - * FlatSB_GetScrollPos (COMCTL32.31) + * FlatSB_GetScrollPos (COMCTL32.@) */ INT WINAPI FlatSB_GetScrollPos(HWND hwnd, int nBar) @@ -163,7 +163,7 @@ FlatSB_GetScrollPos(HWND hwnd, int nBar) } /*********************************************************************** - * FlatSB_SetScrollPos (COMCTL32.35) + * FlatSB_SetScrollPos (COMCTL32.@) */ INT WINAPI FlatSB_SetScrollPos(HWND hwnd, int nBar, INT pos, BOOL bRedraw) @@ -172,7 +172,7 @@ FlatSB_SetScrollPos(HWND hwnd, int nBar, INT pos, BOOL bRedraw) } /*********************************************************************** - * FlatSB_SetScrollInfo (COMCTL32.34) + * FlatSB_SetScrollInfo (COMCTL32.@) */ INT WINAPI FlatSB_SetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info, BOOL bRedraw) @@ -181,7 +181,7 @@ FlatSB_SetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info, BOOL bRedraw) } /*********************************************************************** - * FlatSB_SetScrollRange (COMCTL32.37) + * FlatSB_SetScrollRange (COMCTL32.@) */ INT WINAPI FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 75acaf4a667..50974883ba8 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -485,7 +485,7 @@ IMAGELIST_InternalDrawOverlay(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy) /************************************************************************* - * ImageList_Add [COMCTL32.40] + * ImageList_Add [COMCTL32.@] * * Add an image or images to an image list. * @@ -573,7 +573,7 @@ ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask) /************************************************************************* - * ImageList_AddIcon [COMCTL32.41] + * ImageList_AddIcon [COMCTL32.@] * * Adds an icon to an image list. * @@ -594,7 +594,7 @@ ImageList_AddIcon (HIMAGELIST himl, HICON hIcon) /************************************************************************* - * ImageList_AddMasked [COMCTL32.42] + * ImageList_AddMasked [COMCTL32.@] * * Adds an image or images to an image list and creates a mask from the * specified bitmap using the mask color. @@ -706,7 +706,7 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) /************************************************************************* - * ImageList_BeginDrag [COMCTL32.43] + * ImageList_BeginDrag [COMCTL32.@] * * Creates a temporary image list that contains one image. It will be used * as a drag image. @@ -774,7 +774,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, /************************************************************************* - * ImageList_Copy [COMCTL32.44] + * ImageList_Copy [COMCTL32.@] * * Copies an image of the source image list to an image of the * destination image list. Images can be copied or swapped. @@ -902,7 +902,7 @@ ImageList_Copy (HIMAGELIST himlDst, INT iDst, HIMAGELIST himlSrc, /************************************************************************* - * ImageList_Create [COMCTL32.45] Creates a new image list. + * ImageList_Create [COMCTL32.@] Creates a new image list. * * PARAMS * cx [I] image height @@ -996,7 +996,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, /************************************************************************* - * ImageList_Destroy [COMCTL32.46] + * ImageList_Destroy [COMCTL32.@] * * Destroys an image list. * @@ -1033,7 +1033,7 @@ ImageList_Destroy (HIMAGELIST himl) /************************************************************************* - * ImageList_DragEnter [COMCTL32.47] + * ImageList_DragEnter [COMCTL32.@] * * Locks window update and displays the drag image at the given position. * @@ -1077,7 +1077,7 @@ ImageList_DragEnter (HWND hwndLock, INT x, INT y) /************************************************************************* - * ImageList_DragLeave [COMCTL32.48] + * ImageList_DragLeave [COMCTL32.@] * * Unlocks window update and hides the drag image. * @@ -1110,7 +1110,7 @@ ImageList_DragLeave (HWND hwndLock) /************************************************************************* - * ImageList_DragMove [COMCTL32.49] + * ImageList_DragMove [COMCTL32.@] * * Moves the drag image. * @@ -1203,7 +1203,7 @@ ImageList_DragMove (INT x, INT y) /************************************************************************* - * ImageList_DragShowNolock [COMCTL32.50] + * ImageList_DragShowNolock [COMCTL32.@] * * Shows or hides the drag image. * @@ -1271,7 +1271,7 @@ ImageList_DragShowNolock (BOOL bShow) /************************************************************************* - * ImageList_Draw [COMCTL32.51] Draws an image. + * ImageList_Draw [COMCTL32.@] Draws an image. * * PARAMS * himl [I] handle to image list @@ -1318,7 +1318,7 @@ ImageList_Draw (HIMAGELIST himl, INT i, HDC hdc, /************************************************************************* - * ImageList_DrawEx [COMCTL32.52] + * ImageList_DrawEx [COMCTL32.@] * * Draws an image and allows to use extended drawing features. * @@ -1372,7 +1372,7 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, /************************************************************************* - * ImageList_DrawIndirect [COMCTL32.53] + * ImageList_DrawIndirect [COMCTL32.@] * * Draws an image using ... * @@ -1438,7 +1438,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) /************************************************************************* - * ImageList_Duplicate [COMCTL32.54] Duplicates an image list. + * ImageList_Duplicate [COMCTL32.@] Duplicates an image list. * * PARAMS * himlSrc [I] source image list handle @@ -1490,7 +1490,7 @@ ImageList_Duplicate (HIMAGELIST himlSrc) /************************************************************************* - * ImageList_EndDrag [COMCTL32.55] Finishes a drag operation. + * ImageList_EndDrag [COMCTL32.@] Finishes a drag operation. * * Finishes a drag operation. * @@ -1523,7 +1523,7 @@ ImageList_EndDrag (void) /************************************************************************* - * ImageList_GetBkColor [COMCTL32.56] + * ImageList_GetBkColor [COMCTL32.@] * * Returns the background color of an image list. * @@ -1546,7 +1546,7 @@ ImageList_GetBkColor (HIMAGELIST himl) /************************************************************************* - * ImageList_GetDragImage [COMCTL32.57] + * ImageList_GetDragImage [COMCTL32.@] * * Returns the handle to the internal drag image list. * @@ -1579,7 +1579,7 @@ ImageList_GetDragImage (POINT *ppt, POINT *pptHotspot) /************************************************************************* - * ImageList_GetFlags [COMCTL32.58] + * ImageList_GetFlags [COMCTL32.@] * * BUGS * Stub. @@ -1594,7 +1594,7 @@ ImageList_GetFlags(HIMAGELIST himl) /************************************************************************* - * ImageList_GetIcon [COMCTL32.59] + * ImageList_GetIcon [COMCTL32.@] * * Creates an icon from a masked image of an image list. * @@ -1663,7 +1663,7 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle) /************************************************************************* - * ImageList_GetIconSize [COMCTL32.60] + * ImageList_GetIconSize [COMCTL32.@] * * Retrieves the size of an image in an image list. * @@ -1698,7 +1698,7 @@ ImageList_GetIconSize (HIMAGELIST himl, INT *cx, INT *cy) /************************************************************************* - * ImageList_GetImageCount [COMCTL32.61] + * ImageList_GetImageCount [COMCTL32.@] * * Returns the number of images in an image list. * @@ -1721,7 +1721,7 @@ ImageList_GetImageCount (HIMAGELIST himl) /************************************************************************* - * ImageList_GetImageInfo [COMCTL32.62] + * ImageList_GetImageInfo [COMCTL32.@] * * Returns information about an image in an image list. * @@ -1756,7 +1756,7 @@ ImageList_GetImageInfo (HIMAGELIST himl, INT i, IMAGEINFO *pImageInfo) /************************************************************************* - * ImageList_GetImageRect [COMCTL32.63] + * ImageList_GetImageRect [COMCTL32.@] * * Retrieves the rectangle of the specified image in an image list. * @@ -1791,8 +1791,8 @@ ImageList_GetImageRect (HIMAGELIST himl, INT i, LPRECT lpRect) /************************************************************************* - * ImageList_LoadImage [COMCTL32.64] - * ImageList_LoadImageA [COMCTL32.65] + * ImageList_LoadImage [COMCTL32.@] + * ImageList_LoadImageA [COMCTL32.@] * * Creates an image list from a bitmap, icon or cursor. * @@ -1869,7 +1869,7 @@ ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow, /************************************************************************* - * ImageList_LoadImageW [COMCTL32.66] + * ImageList_LoadImageW [COMCTL32.@] * * Creates an image list from a bitmap, icon or cursor. * @@ -1946,7 +1946,7 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, /************************************************************************* - * ImageList_Merge [COMCTL32.67] + * ImageList_Merge [COMCTL32.@] * * Creates a new image list that contains a merged image from the specified * images of both source image lists. @@ -2178,7 +2178,7 @@ ret1: } /************************************************************************* - * ImageList_Read [COMCTL32.68] + * ImageList_Read [COMCTL32.@] * * Reads an image list from a stream. * @@ -2274,7 +2274,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) /************************************************************************* - * ImageList_Remove [COMCTL32.69] Removes an image from an image list + * ImageList_Remove [COMCTL32.@] Removes an image from an image list * * PARAMS * himl [I] image list handle @@ -2406,7 +2406,7 @@ ImageList_Remove (HIMAGELIST himl, INT i) /************************************************************************* - * ImageList_Replace [COMCTL32.70] + * ImageList_Replace [COMCTL32.@] * * Replaces an image in an image list with a new image. * @@ -2477,7 +2477,7 @@ ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage, /************************************************************************* - * ImageList_ReplaceIcon [COMCTL32.75] + * ImageList_ReplaceIcon [COMCTL32.@] * * Replaces an image in an image list using an icon. * @@ -2573,7 +2573,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT i, HICON hIcon) /************************************************************************* - * ImageList_SetBkColor [COMCTL32.76] + * ImageList_SetBkColor [COMCTL32.@] * * Sets the background color of an image list. * @@ -2601,7 +2601,7 @@ ImageList_SetBkColor (HIMAGELIST himl, COLORREF clrBk) /************************************************************************* - * ImageList_SetDragCursorImage [COMCTL32.77] + * ImageList_SetDragCursorImage [COMCTL32.@] * * Combines the specified image with the current drag image * @@ -2683,7 +2683,7 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag, /************************************************************************* - * ImageList_SetFilter [COMCTL32.78] + * ImageList_SetFilter [COMCTL32.@] * * Sets a filter (or does something completely different)!!??? * @@ -2712,7 +2712,7 @@ ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter) /************************************************************************* - * ImageList_SetFlags [COMCTL32.79] + * ImageList_SetFlags [COMCTL32.@] * * BUGS * Stub. @@ -2727,7 +2727,7 @@ ImageList_SetFlags(HIMAGELIST himl, DWORD flags) /************************************************************************* - * ImageList_SetIconSize [COMCTL32.80] + * ImageList_SetIconSize [COMCTL32.@] * * Sets the image size of the bitmap and deletes all images. * @@ -2776,7 +2776,7 @@ ImageList_SetIconSize (HIMAGELIST himl, INT cx, INT cy) /************************************************************************* - * ImageList_SetImageCount [COMCTL32.81] + * ImageList_SetImageCount [COMCTL32.@] * * Resizes an image list to the specified number of images. * @@ -2871,7 +2871,7 @@ ImageList_SetImageCount (HIMAGELIST himl, INT iImageCount) /************************************************************************* - * ImageList_SetOverlayImage [COMCTL32.82] + * ImageList_SetOverlayImage [COMCTL32.@] * * Assigns an overlay mask index to an existing image in an image list. * @@ -2999,7 +2999,7 @@ _write_bitmap(HBITMAP hBitmap, LPSTREAM pstm, int cx, int cy) /************************************************************************* - * ImageList_Write [COMCTL32.83] + * ImageList_Write [COMCTL32.@] * * Writes an image list to a stream. * diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 512b6ca4636..a496febb9a0 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2203,8 +2203,8 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) } /****************************************************************************** - * PropertySheet (COMCTL32.87) - * PropertySheetA (COMCTL32.88) + * PropertySheet (COMCTL32.@) + * PropertySheetA (COMCTL32.@) */ INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) { @@ -2248,7 +2248,7 @@ INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) } /****************************************************************************** - * PropertySheetW (COMCTL32.89) + * PropertySheetW (COMCTL32.@) */ INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) { @@ -2292,8 +2292,8 @@ INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) } /****************************************************************************** - * CreatePropertySheetPage (COMCTL32.18) - * CreatePropertySheetPageA (COMCTL32.19) + * CreatePropertySheetPage (COMCTL32.@) + * CreatePropertySheetPageA (COMCTL32.@) */ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( LPCPROPSHEETPAGEA lpPropSheetPage) @@ -2322,7 +2322,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( } /****************************************************************************** - * CreatePropertySheetPageW (COMCTL32.20) + * CreatePropertySheetPageW (COMCTL32.@) */ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage) { @@ -2357,7 +2357,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage } /****************************************************************************** - * DestroyPropertySheetPage (COMCTL32.24) + * DestroyPropertySheetPage (COMCTL32.@) */ BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage) { @@ -2799,4 +2799,3 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return FALSE; } - diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 25eb86e2186..cef57ae534a 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -18,12 +18,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include #include #include #include #include -#include +#ifdef HAVE_PWD_H +# include +#endif #include #include "windef.h" diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 46e3f5a85a8..4200d583791 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -416,7 +416,7 @@ typedef struct WINE_DEFAULT_DEBUG_CHANNEL(seh); -typedef int (*wine_signal_handler)(unsigned sig); +typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; @@ -426,7 +426,7 @@ static sigset_t all_sigs; /*********************************************************************** * dispatch_signal */ -inline static int dispatch_signal(unsigned sig) +inline static int dispatch_signal(unsigned int sig) { if (handlers[sig] == NULL) return 0; return handlers[sig](sig); @@ -1086,7 +1086,7 @@ static int set_handler( int sig, int have_sigaltstack, void (*func)() ) /*********************************************************************** * __wine_set_signal_handler (NTDLL.@) */ -int __wine_set_signal_handler(unsigned sig, wine_signal_handler wsh) +int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 257c14db1fd..66f49cf0b1b 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); -typedef int (*wine_signal_handler)(unsigned sig); +typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; @@ -50,7 +50,7 @@ static sigset_t all_sigs; /*********************************************************************** * dispatch_signal */ -inline static int dispatch_signal(unsigned sig) +inline static int dispatch_signal(unsigned int sig) { if (handlers[sig] == NULL) return 0; return handlers[sig](sig); @@ -363,7 +363,7 @@ static int set_handler( int sig, void (*func)() ) /*********************************************************************** * __wine_set_signal_handler (NTDLL.@) */ -int __wine_set_signal_handler(unsigned sig, wine_signal_handler wsh) +int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 49911d6d1cf..dc4927f3951 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -477,6 +477,8 @@ HRESULT WINAPI __CLSIDFromStringA( return S_OK; } +/*****************************************************************************/ + HRESULT WINAPI CLSIDFromString( LPCOLESTR idstr, /* [in] string representation of GUID */ CLSID *id ) /* [out] GUID represented by above string */ diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 8832bf38556..5091c76f13f 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -700,7 +700,7 @@ init SHLWAPI_LibMain @ stdcall PathIsLFNFileSpecW(wstr) PathIsLFNFileSpecW @ stdcall PathFindSuffixArrayA(str ptr long) PathFindSuffixArrayA @ stdcall PathFindSuffixArrayW(wstr ptr long) PathFindSuffixArrayW -@ stdcall _SHGetInstanceExplorer@4(ptr) _SHGetInstanceExplorer +@ stdcall _SHGetInstanceExplorer(ptr) _SHGetInstanceExplorer @ stdcall PathUndecorateA(str) PathUndecorateA @ stdcall PathUndecorateW(wstr) PathUndecorateW @ stub PathUnExpandEnvStringsA diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index f169766fe8b..386488fffcd 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -241,7 +241,9 @@ static DWORD WINAPI SHLWAPI_ThreadWrapper(PVOID pTi) } /************************************************************************* - * SHCreateThread [SHLWAPI.16] + * @ [SHLWAPI.16] + * + * SHCreateThread * * Create a new thread. * diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 3d27cdda5dd..e20f1bfc2bb 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -775,7 +775,7 @@ void VGA_GetCharacterAtCursor(BYTE *ascii, BYTE *attr) */ static void VGA_CopyFrameToWindow(void) { - //FIXME: add implementation + /* FIXME: add implementation */ } /* @@ -783,7 +783,7 @@ static void VGA_CopyFrameToWindow(void) */ static void VGA_CopyWindowToFrame(void) { - //FIXME: fix implementation + /* FIXME: fix implementation */ char *dat = DOSMEM_MapDosToLinear(0xa0000); memmove(vga_fb_data, dat, 65536); } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3d8e3d7d626..50b2f23f7e5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1791,7 +1791,7 @@ BOOL WINAPI InternetUnlockRequestFile( HANDLE hLockHandle) * */ -BOOL InternetAutoDial(DWORD dwFlags, HWND hwndParent) +BOOL WINAPI InternetAutoDial(DWORD dwFlags, HWND hwndParent) { FIXME("STUB\n"); diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index 15c9d3f3ce1..f6d9e1e5f47 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -31,7 +31,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #ifdef HAVE_SYS_MMAN_H # include #endif diff --git a/dlls/winmm/winealsa/audio_05.c b/dlls/winmm/winealsa/audio_05.c index 78db57dcbfb..deb2e2151d8 100644 --- a/dlls/winmm/winealsa/audio_05.c +++ b/dlls/winmm/winealsa/audio_05.c @@ -29,7 +29,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #ifdef HAVE_SYS_MMAN_H # include #endif diff --git a/dlls/winmm/wineaudioio/audio.c b/dlls/winmm/wineaudioio/audio.c index 1968f7cacba..5afa9f488c8 100644 --- a/dlls/winmm/wineaudioio/audio.c +++ b/dlls/winmm/wineaudioio/audio.c @@ -45,7 +45,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #ifdef HAVE_SYS_MMAN_H # include #endif @@ -201,7 +203,7 @@ LONG LIBAUDIOIO_WaveInit(void) spec[RECORD].precision=spec[PLAYBACK].precision=16 ; spec[RECORD].endian=spec[PLAYBACK].endian=ENDIAN_INTEL; spec[RECORD].disable_threads=spec[PLAYBACK].disable_threads=1; - spec[RECORD].type=spec[PLAYBACK].type=TYPE_SIGNED; // in 16 bit mode this is what typical PC hardware expects + spec[RECORD].type=spec[PLAYBACK].type=TYPE_SIGNED; /* in 16 bit mode this is what typical PC hardware expects */ mode = O_WRONLY|O_NDELAY; @@ -1204,7 +1206,7 @@ static DWORD wodGetNumDevs(void) } /************************************************************************** - * wodMessage (WINEOSS.7) + * wodMessage (WINEAUDIOIO.@) */ DWORD WINAPI LIBAUDIOIO_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) @@ -1398,7 +1400,9 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, LPDWORD lpdwPlay, LPDWORD lpdwWrite) { ICOM_THIS(IDsDriverBufferImpl,iface); -// count_info info; +#if 0 + count_info info; +#endif DWORD ptr; TRACE("(%p)\n",iface); @@ -1564,7 +1568,9 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, ICOM_THIS(IDsDriverImpl,iface); IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; HRESULT err; -// audio_buf_info info; +#if 0 + audio_buf_info info; +#endif int enable = 0; TRACE("(%p,%p,%lx,%lx)\n",iface,pwfx,dwFlags,dwCardAddress); @@ -1592,7 +1598,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, return DSERR_GENERIC; } #endif - WOutDev[This->wDevID].maplen =64*1024; // Map 64 K at a time + WOutDev[This->wDevID].maplen =64*1024; /* Map 64 K at a time */ #if 0 (*ippdsdb)->buflen = info.fragstotal * info.fragsize; @@ -2225,7 +2231,7 @@ static DWORD widGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) } /************************************************************************** - * widMessage (WINEOSS.6) + * widMessage (WINEAUDIOIO.@) */ DWORD WINAPI LIBAUDIOIO_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) @@ -2260,7 +2266,7 @@ DWORD WINAPI LIBAUDIOIO_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, #else /* HAVE_LIBAUDIOIO */ /************************************************************************** - * wodMessage (WINEOSS.7) + * wodMessage (WINEAUDIOIO.@) */ DWORD WINAPI LIBAUDIOIO_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) @@ -2270,7 +2276,7 @@ DWORD WINAPI LIBAUDIOIO_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, } /************************************************************************** - * widMessage (WINEOSS.6) + * widMessage (WINEAUDIOIO.@) */ DWORD WINAPI LIBAUDIOIO_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c index 78e4589681a..c6f51e3f17d 100644 --- a/dlls/winmm/winenas/audio.c +++ b/dlls/winmm/winenas/audio.c @@ -44,7 +44,9 @@ #include #include -//#define EMULATE_SB16 +#if 0 +#define EMULATE_SB16 +#endif #define FRAG_SIZE 1024 #define FRAG_COUNT 10 @@ -180,7 +182,7 @@ static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv); -// NASFUNC +/* NASFUNC */ static AuBool event_handler(AuServer* aud, AuEvent* ev, AuEventHandlerRec* hnd); static int nas_init(void); static int nas_end(void); @@ -753,13 +755,13 @@ static void wodPlayer_ProcessMessages(WINE_WAVEOUT* wwo) SetEvent(ev); break; case WINE_WM_CLOSING: - // sanity check: this should not happen since the device must have been reset before + /* sanity check: this should not happen since the device must have been reset before */ if (wwo->lpQueuePtr || wwo->lpPlayPtr) ERR("out of sync\n"); wwo->hThread = 0; wwo->state = WINE_WS_CLOSED; SetEvent(ev); ExitThread(0); - // shouldn't go here + /* shouldn't go here */ default: FIXME("unknown message %d\n", msg); break; @@ -1106,7 +1108,9 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) if (lpTime == NULL) return MMSYSERR_INVALPARAM; wwo = &WOutDev[wDevID]; -// NAS_AddRingMessage(&wwo->msgRing, WINE_WM_UPDATE, 0, TRUE); +#if 0 + NAS_AddRingMessage(&wwo->msgRing, WINE_WM_UPDATE, 0, TRUE); +#endif val = wwo->WrittenTotal; TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%lu nChannels=%u nAvgBytesPerSec=%lu\n", diff --git a/files/profile.c b/files/profile.c index 3b2ae26c756..3b6084339e2 100644 --- a/files/profile.c +++ b/files/profile.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include #include #include @@ -27,7 +29,9 @@ #include #include #include -#include +#ifdef HAVE_PWD_H +# include +#endif #include #include "windef.h" diff --git a/scheduler/client.c b/scheduler/client.c index 49443035796..cc95af31e29 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -25,7 +25,9 @@ #include #include #include -#include +#ifdef HAVE_PWD_H +# include +#endif #include #include #include