From 172cd1b96749e350db69e00c491dc457f5b6bc43 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Mon, 11 Jun 2001 20:16:11 +0000 Subject: [PATCH] Fixed some issues found by winapi_check. --- dlls/gdi/printdrv.c | 14 ++-- dlls/glu32/glu.c | 135 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvideo/msvideo_main.c | 30 ++++---- dlls/ole32/antimoniker.c | 2 +- dlls/ole32/compobj.c | 2 +- dlls/ole32/compositemoniker.c | 4 +- dlls/ole32/itemmoniker.c | 2 +- dlls/shlwapi/ordinal.c | 4 +- dlls/shlwapi/path.c | 4 +- dlls/shlwapi/reg.c | 4 +- dlls/wineps/afm.c | 6 +- dlls/wineps/init.c | 2 + dlls/winmm/mmsystem.c | 6 +- graphics/driver.c | 10 +-- misc/cpu.c | 4 +- 16 files changed, 187 insertions(+), 46 deletions(-) diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c index 40b89a9c81..85982025e7 100644 --- a/dlls/gdi/printdrv.c +++ b/dlls/gdi/printdrv.c @@ -62,7 +62,7 @@ INT16 WINAPI StartDoc16( HDC16 hdc, const DOCINFO16 *lpdoc ) } /****************************************************************** - * StartDocA [GDI32.347] + * StartDocA [GDI32.@] * * StartDoc calls the STARTDOC Escape with the input data pointing to DocName * and the output data (which is used as a second input parameter).pointing at @@ -89,7 +89,7 @@ INT WINAPI StartDocA(HDC hdc, const DOCINFOA* doc) } /************************************************************************* - * StartDocW [GDI32.348] + * StartDocW [GDI32.@] * */ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) @@ -128,7 +128,7 @@ INT16 WINAPI EndDoc16(HDC16 hdc) } /****************************************************************** - * EndDoc [GDI32.76] + * EndDoc [GDI32.@] * */ INT WINAPI EndDoc(HDC hdc) @@ -155,7 +155,7 @@ INT16 WINAPI StartPage16(HDC16 hdc) } /****************************************************************** - * StartPage [GDI32.349] + * StartPage [GDI32.@] * */ INT WINAPI StartPage(HDC hdc) @@ -182,7 +182,7 @@ INT16 WINAPI EndPage16( HDC16 hdc ) } /****************************************************************** - * EndPage [GDI32.77] + * EndPage [GDI32.@] * */ INT WINAPI EndPage(HDC hdc) @@ -213,7 +213,7 @@ INT16 WINAPI AbortDoc16(HDC16 hdc) } /****************************************************************************** - * AbortDoc [GDI32.105] + * AbortDoc [GDI32.@] */ INT WINAPI AbortDoc(HDC hdc) { @@ -269,7 +269,7 @@ INT16 WINAPI SetAbortProc16(HDC16 hdc, SEGPTR abrtprc) } /********************************************************************** - * SetAbortProc (GDI32.301) + * SetAbortProc (GDI32.@) * */ INT WINAPI SetAbortProc(HDC hdc, ABORTPROC abrtprc) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 7e6eaed40d..560a84d0cc 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -1,225 +1,360 @@ #include "winbase.h" +/*********************************************************************** + * gluLookAt (GLU32.@) + */ extern int gluLookAt(double arg0,double arg1,double arg2,double arg3,double arg4,double arg5,double arg6,double arg7,double arg8); int WINAPI wine_gluLookAt(double arg0,double arg1,double arg2,double arg3,double arg4,double arg5,double arg6,double arg7,double arg8) { return gluLookAt(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); } +/*********************************************************************** + * gluOrtho2D (GLU32.@) + */ extern int gluOrtho2D(double arg0,double arg1,double arg2,double arg3); int WINAPI wine_gluOrtho2D(double arg0,double arg1,double arg2,double arg3) { return gluOrtho2D(arg0,arg1,arg2,arg3); } +/*********************************************************************** + * gluPerspective (GLU32.@) + */ extern int gluPerspective(double arg0,double arg1,double arg2,double arg3); int WINAPI wine_gluPerspective(double arg0,double arg1,double arg2,double arg3) { return gluPerspective(arg0,arg1,arg2,arg3); } +/*********************************************************************** + * gluPickMatrix (GLU32.@) + */ extern int gluPickMatrix(double arg0,double arg1,double arg2,double arg3,void *arg4); int WINAPI wine_gluPickMatrix(double arg0,double arg1,double arg2,double arg3,void *arg4) { return gluPickMatrix(arg0,arg1,arg2,arg3,arg4); } +/*********************************************************************** + * gluProject (GLU32.@) + */ extern int gluProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8); int WINAPI wine_gluProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8) { return gluProject(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); } +/*********************************************************************** + * gluUnProject (GLU32.@) + */ extern int gluUnProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8); int WINAPI wine_gluUnProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8) { return gluUnProject(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); } +/*********************************************************************** + * gluErrorString (GLU32.@) + */ extern int gluErrorString(int arg0); int WINAPI wine_gluErrorString(int arg0) { return gluErrorString(arg0); } +/*********************************************************************** + * gluScaleImage (GLU32.@) + */ extern int gluScaleImage(int arg0,int arg1,int arg2,int arg3,void *arg4,int arg5,int arg6,int arg7,void *arg8); int WINAPI wine_gluScaleImage(int arg0,int arg1,int arg2,int arg3,void *arg4,int arg5,int arg6,int arg7,void *arg8) { return gluScaleImage(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); } +/*********************************************************************** + * gluBuild1DMipmaps (GLU32.@) + */ extern int gluBuild1DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,void *arg5); int WINAPI wine_gluBuild1DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,void *arg5) { return gluBuild1DMipmaps(arg0,arg1,arg2,arg3,arg4,arg5); } +/*********************************************************************** + * gluBuild2DMipmaps (GLU32.@) + */ extern int gluBuild2DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,int arg5,void *arg6); int WINAPI wine_gluBuild2DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,int arg5,void *arg6) { return gluBuild2DMipmaps(arg0,arg1,arg2,arg3,arg4,arg5,arg6); } +/*********************************************************************** + * gluNewQuadric (GLU32.@) + */ extern int gluNewQuadric(); int WINAPI wine_gluNewQuadric() { return gluNewQuadric(); } +/*********************************************************************** + * gluDeleteQuadric (GLU32.@) + */ extern int gluDeleteQuadric(void *arg0); int WINAPI wine_gluDeleteQuadric(void *arg0) { return gluDeleteQuadric(arg0); } +/*********************************************************************** + * gluQuadricDrawStyle (GLU32.@) + */ extern int gluQuadricDrawStyle(void *arg0,int arg1); int WINAPI wine_gluQuadricDrawStyle(void *arg0,int arg1) { return gluQuadricDrawStyle(arg0,arg1); } +/*********************************************************************** + * gluQuadricOrientation (GLU32.@) + */ extern int gluQuadricOrientation(void *arg0,int arg1); int WINAPI wine_gluQuadricOrientation(void *arg0,int arg1) { return gluQuadricOrientation(arg0,arg1); } +/*********************************************************************** + * gluQuadricNormals (GLU32.@) + */ extern int gluQuadricNormals(void *arg0,int arg1); int WINAPI wine_gluQuadricNormals(void *arg0,int arg1) { return gluQuadricNormals(arg0,arg1); } +/*********************************************************************** + * gluQuadricTexture (GLU32.@) + */ extern int gluQuadricTexture(void *arg0,int arg1); int WINAPI wine_gluQuadricTexture(void *arg0,int arg1) { return gluQuadricTexture(arg0,arg1); } +/*********************************************************************** + * gluQuadricCallback (GLU32.@) + */ extern int gluQuadricCallback(void *arg0,int arg1,void *arg2); int WINAPI wine_gluQuadricCallback(void *arg0,int arg1,void *arg2) { return gluQuadricCallback(arg0,arg1,arg2); } +/*********************************************************************** + * gluCylinder (GLU32.@) + */ extern int gluCylinder(void *arg0,double arg1,double arg2,double arg3,int arg4,int arg5); int WINAPI wine_gluCylinder(void *arg0,double arg1,double arg2,double arg3,int arg4,int arg5) { return gluCylinder(arg0,arg1,arg2,arg3,arg4,arg5); } +/*********************************************************************** + * gluSphere (GLU32.@) + */ extern int gluSphere(void *arg0,double arg1,int arg2,int arg3); int WINAPI wine_gluSphere(void *arg0,double arg1,int arg2,int arg3) { return gluSphere(arg0,arg1,arg2,arg3); } +/*********************************************************************** + * gluDisk (GLU32.@) + */ extern int gluDisk(void *arg0,double arg1,double arg2,int arg3,int arg4); int WINAPI wine_gluDisk(void *arg0,double arg1,double arg2,int arg3,int arg4) { return gluDisk(arg0,arg1,arg2,arg3,arg4); } +/*********************************************************************** + * gluPartialDisk (GLU32.@) + */ extern int gluPartialDisk(void *arg0,double arg1,double arg2,int arg3,int arg4,double arg5,double arg6); int WINAPI wine_gluPartialDisk(void *arg0,double arg1,double arg2,int arg3,int arg4,double arg5,double arg6) { return gluPartialDisk(arg0,arg1,arg2,arg3,arg4,arg5,arg6); } +/*********************************************************************** + * gluNewNurbsRenderer (GLU32.@) + */ extern int gluNewNurbsRenderer(); int WINAPI wine_gluNewNurbsRenderer() { return gluNewNurbsRenderer(); } +/*********************************************************************** + * gluDeleteNurbsRenderer (GLU32.@) + */ extern int gluDeleteNurbsRenderer(void *arg0); int WINAPI wine_gluDeleteNurbsRenderer(void *arg0) { return gluDeleteNurbsRenderer(arg0); } +/*********************************************************************** + * gluLoadSamplingMatrices (GLU32.@) + */ extern int gluLoadSamplingMatrices(void *arg0,void *arg1,void *arg2,void *arg3); int WINAPI wine_gluLoadSamplingMatrices(void *arg0,void *arg1,void *arg2,void *arg3) { return gluLoadSamplingMatrices(arg0,arg1,arg2,arg3); } +/*********************************************************************** + * gluNurbsProperty (GLU32.@) + */ extern int gluNurbsProperty(void *arg0,int arg1,int arg2); int WINAPI wine_gluNurbsProperty(void *arg0,int arg1,int arg2) { return gluNurbsProperty(arg0,arg1,arg2); } +/*********************************************************************** + * gluGetNurbsProperty (GLU32.@) + */ extern int gluGetNurbsProperty(void *arg0,int arg1,void *arg2); int WINAPI wine_gluGetNurbsProperty(void *arg0,int arg1,void *arg2) { return gluGetNurbsProperty(arg0,arg1,arg2); } +/*********************************************************************** + * gluBeginCurve (GLU32.@) + */ extern int gluBeginCurve(void *arg0); int WINAPI wine_gluBeginCurve(void *arg0) { return gluBeginCurve(arg0); } +/*********************************************************************** + * gluEndCurve (GLU32.@) + */ extern int gluEndCurve(void *arg0); int WINAPI wine_gluEndCurve(void *arg0) { return gluEndCurve(arg0); } +/*********************************************************************** + * gluNurbsCurve (GLU32.@) + */ extern int gluNurbsCurve(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6); int WINAPI wine_gluNurbsCurve(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6) { return gluNurbsCurve(arg0,arg1,arg2,arg3,arg4,arg5,arg6); } +/*********************************************************************** + * gluBeginSurface (GLU32.@) + */ extern int gluBeginSurface(void *arg0); int WINAPI wine_gluBeginSurface(void *arg0) { return gluBeginSurface(arg0); } +/*********************************************************************** + * gluEndSurface (GLU32.@) + */ extern int gluEndSurface(void *arg0); int WINAPI wine_gluEndSurface(void *arg0) { return gluEndSurface(arg0); } +/*********************************************************************** + * gluNurbsSurface (GLU32.@) + */ extern int gluNurbsSurface(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6,void *arg7,int arg8,int arg9,int arg10); int WINAPI wine_gluNurbsSurface(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6,void *arg7,int arg8,int arg9,int arg10) { return gluNurbsSurface(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); } +/*********************************************************************** + * gluBeginTrim (GLU32.@) + */ extern int gluBeginTrim(void *arg0); int WINAPI wine_gluBeginTrim(void *arg0) { return gluBeginTrim(arg0); } +/*********************************************************************** + * gluEndTrim (GLU32.@) + */ extern int gluEndTrim(void *arg0); int WINAPI wine_gluEndTrim(void *arg0) { return gluEndTrim(arg0); } +/*********************************************************************** + * gluPwlCurve (GLU32.@) + */ extern int gluPwlCurve(void *arg0,int arg1,void *arg2,int arg3,int arg4); int WINAPI wine_gluPwlCurve(void *arg0,int arg1,void *arg2,int arg3,int arg4) { return gluPwlCurve(arg0,arg1,arg2,arg3,arg4); } +/*********************************************************************** + * gluNurbsCallback (GLU32.@) + */ extern int gluNurbsCallback(void *arg0,int arg1,void *arg2); int WINAPI wine_gluNurbsCallback(void *arg0,int arg1,void *arg2) { return gluNurbsCallback(arg0,arg1,arg2); } +/*********************************************************************** + * gluNewTess (GLU32.@) + */ extern int gluNewTess(); int WINAPI wine_gluNewTess() { return gluNewTess(); } +/*********************************************************************** + * gluDeleteTess (GLU32.@) + */ extern int gluDeleteTess(void *arg0); int WINAPI wine_gluDeleteTess(void *arg0) { return gluDeleteTess(arg0); } +/*********************************************************************** + * gluTessVertex (GLU32.@) + */ extern int gluTessVertex(void *arg0,void *arg1,void *arg2); int WINAPI wine_gluTessVertex(void *arg0,void *arg1,void *arg2) { return gluTessVertex(arg0,arg1,arg2); } +/*********************************************************************** + * gluTessCallback (GLU32.@) + */ extern int gluTessCallback(void *arg0,int arg1,void *arg2); int WINAPI wine_gluTessCallback(void *arg0,int arg1,void *arg2) { return gluTessCallback(arg0,arg1,arg2); } +/*********************************************************************** + * gluBeginPolygon (GLU32.@) + */ extern int gluBeginPolygon(void *arg0); int WINAPI wine_gluBeginPolygon(void *arg0) { return gluBeginPolygon(arg0); } +/*********************************************************************** + * gluEndPolygon (GLU32.@) + */ extern int gluEndPolygon(void *arg0); int WINAPI wine_gluEndPolygon(void *arg0) { return gluEndPolygon(arg0); } +/*********************************************************************** + * gluNextContour (GLU32.@) + */ extern int gluNextContour(void *arg0,int arg1); int WINAPI wine_gluNextContour(void *arg0,int arg1) { return gluNextContour(arg0,arg1); } +/*********************************************************************** + * gluGetString (GLU32.@) + */ extern int gluGetString(int arg0); int WINAPI wine_gluGetString(int arg0) { return gluGetString(arg0); } +/*********************************************************************** + * gluCheckExtension (GLU32.@) + */ int WINAPI wine_gluCheckExtension( const char *extName, void *extString ) { return 0; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ce6f427bd6..4a2663f44e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -442,9 +442,9 @@ debug_channels (msvcrt) @ varargs _snprintf(str long str) snprintf @ forward -noimport _snwprintf ntdll._snwprintf @ cdecl _sopen(str long long) MSVCRT__sopen -@ varargs _spawnl(str str) _spawnl +@ varargs _spawnl(long str str) _spawnl @ stub _spawnle #(str str) varargs -@ varargs _spawnlp(str str) _spawnlp +@ varargs _spawnlp(long str str) _spawnlp @ stub _spawnlpe #(str str) varargs @ cdecl _spawnv(long str ptr) _spawnv @ cdecl _spawnve(long str ptr ptr) _spawnve diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 2861d57616..33ea1116a4 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -34,7 +34,7 @@ void MSVIDEO_UnmapMsg16To32(UINT msg, LPVOID lpv, LPDWORD lParam1, LPDWORD lPara LRESULT MSVIDEO_SendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2, BOOL bFrom32); /*********************************************************************** - * VideoForWindowsVersion [MSVFW.2][MSVIDEO.2] + * VideoForWindowsVersion [MSVFW32.2][MSVIDEO.2] * Returns the version in major.minor form. * In Windows95 this returns 0x040003b6 (4.950) */ @@ -115,7 +115,7 @@ DWORD WINAPI VideoCapDriverDescAndVer( /* system.ini: [drivers] */ /*********************************************************************** - * ICInfo [MSVFW.33] + * ICInfo [MSVFW32.33] * Get information about an installable compressor. Return TRUE if there * is one. */ @@ -170,7 +170,7 @@ BOOL16 VFWAPI ICInfo16( } /*********************************************************************** - * ICOpen [MSVFW.37] + * ICOpen [MSVFW32.37] * Opens an installable compressor. Return special handle. */ HIC VFWAPI ICOpen(DWORD fccType,DWORD fccHandler,UINT wMode) { @@ -264,7 +264,7 @@ HIC MSVIDEO_OpenFunc(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHa } /*********************************************************************** - * ICOpenFunction [MSVFW.38] + * ICOpenFunction [MSVFW32.38] */ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler) { return MSVIDEO_OpenFunc(fccType,fccHandler,wMode,lpfnHandler,TRUE); @@ -286,7 +286,7 @@ HIC16 VFWAPI ICOpenFunction16(DWORD fccType, DWORD fccHandler, UINT16 wMode, FAR } /*********************************************************************** - * ICGetInfo [MSVFW.30] + * ICGetInfo [MSVFW32.30] */ LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo,DWORD cb) { LRESULT ret; @@ -310,7 +310,7 @@ LRESULT VFWAPI ICGetInfo16(HIC16 hic, ICINFO16 *picinfo,DWORD cb) { } /*********************************************************************** - * ICLocate [MSVFW.35] + * ICLocate [MSVFW32.35] */ HIC VFWAPI ICLocate( DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, @@ -400,7 +400,7 @@ HIC16 VFWAPI ICLocate16(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbi } /*********************************************************************** - * ICGetDisplayFormat [MSVFW.29] + * ICGetDisplayFormat [MSVFW32.29] */ HIC VFWAPI ICGetDisplayFormat( HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut, @@ -462,7 +462,7 @@ HIC16 VFWAPI ICGetDisplayFormat16(HIC16 hic, LPBITMAPINFOHEADER lpbiIn, } /*********************************************************************** - * ICCompress [MSVFW.23] + * ICCompress [MSVFW32.23] */ DWORD VFWAPIV ICCompress( @@ -525,7 +525,7 @@ DWORD VFWAPIV ICCompress16(HIC16 hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiOutp } /*********************************************************************** - * ICDecompress [MSVFW.26] + * ICDecompress [MSVFW32.26] */ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat, LPVOID lpData,LPBITMAPINFOHEADER lpbi,LPVOID lpBits) @@ -972,7 +972,7 @@ LRESULT MSVIDEO_SendMessage(HIC hic,UINT msg,DWORD lParam1,DWORD lParam2, BOOL b } /*********************************************************************** - * ICSendMessage [MSVFW.40] + * ICSendMessage [MSVFW32.40] */ LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2) { return MSVIDEO_SendMessage(hic,msg,lParam1,lParam2,TRUE); @@ -1019,7 +1019,7 @@ LRESULT VFWAPIV ICMessage16(void) { } /*********************************************************************** - * ICDrawBegin [MSVFW.28] + * ICDrawBegin [MSVFW32.28] */ DWORD VFWAPIV ICDrawBegin( HIC hic, /* [in] */ @@ -1114,7 +1114,7 @@ DWORD VFWAPIV ICDrawBegin16( } /*********************************************************************** - * ICDraw [MSVFW.27] + * ICDraw [MSVFW32.27] */ DWORD VFWAPIV ICDraw(HIC hic, DWORD dwFlags, LPVOID lpFormat, LPVOID lpData, DWORD cbData, LONG lTime) { ICDRAW icd; @@ -1154,7 +1154,7 @@ DWORD VFWAPIV ICDraw16( } /*********************************************************************** - * ICClose [MSVFW.22] + * ICClose [MSVFW32.22] */ LRESULT WINAPI ICClose(HIC hic) { WINE_HIC *whic = GlobalLock16(hic); @@ -1180,7 +1180,7 @@ LRESULT WINAPI ICClose16(HIC16 hic) { } /*********************************************************************** - * MCIWndCreateA [MSVFW.44 & MSVFW.45] + * MCIWndCreateA [MSVFW32.44][MSVFW32.45] */ HWND VFWAPIV MCIWndCreateA(HWND hwndParent, HINSTANCE hInstance, DWORD dwStyle,LPCSTR szFile) @@ -1190,7 +1190,7 @@ HWND VFWAPIV MCIWndCreateA(HWND hwndParent, HINSTANCE hInstance, } /*********************************************************************** - * MCIWndCreateW [MSVFW.46] + * MCIWndCreateW [MSVFW32.46] */ HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance, DWORD dwStyle,LPCWSTR szFile) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 2a696b4d39..065385a4a9 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -619,7 +619,7 @@ HRESULT WINAPI AntiMonikerROTDataImpl_GetComparaisonData(IROTData* iface, } /****************************************************************************** - * CreateAntiMoniker [OLE.55] + * CreateAntiMoniker [OLE32.55] ******************************************************************************/ HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk) { diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a7cdfe7e14..c4ac82b01d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1719,7 +1719,7 @@ HRESULT WINAPI CoGetState16(LPDWORD state) return S_OK; } /*********************************************************************** - * CoSetState [COM32.42] + * CoSetState [OLE32.42] */ HRESULT WINAPI CoSetState(LPDWORD state) { diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 47f9e6b20e..b7dd697677 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1644,7 +1644,7 @@ HRESULT WINAPI EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker, } /****************************************************************************** - * CreateGenericComposite [OLE.55] + * CreateGenericComposite [OLE32.55] ******************************************************************************/ HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite) { @@ -1693,7 +1693,7 @@ HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPM } /****************************************************************************** - * MonikerCommonPrefixWith [OLE.55] + * MonikerCommonPrefixWith [OLE32.55] ******************************************************************************/ HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon) { diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index f091b7ad18..04f2d80c94 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -951,7 +951,7 @@ HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim,LPCOLESTR lpszItem,LPM } /****************************************************************************** - * CreateItemMoniker [OLE.55] + * CreateItemMoniker [OLE32.55] ******************************************************************************/ HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim,LPCOLESTR lpszItem, LPMONIKER * ppmk) { diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index dd46da5f47..ba163b0dad 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -457,8 +457,8 @@ INT WINAPI SHLWAPI_217(LPCWSTR lpSrcStr, LPSTR lpDstStr, LPINT lpnMultiCharCount */ HRESULT WINAPI SHLWAPI_219 ( LPVOID w, /* [???] NOTE: returned by LocalAlloc, 0x450 bytes, iface */ - LPVOID x, - REFIID riid, /* e.g. IWebBrowser2 */ + LPVOID x, /* [???] */ + REFIID riid, /* [???] e.g. IWebBrowser2 */ LPWSTR z) /* [???] NOTE: OUT: path */ { FIXME("(%p %s %s %p)stub\n",w,debugstr_a(x),debugstr_guid(riid),z); diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index dac041a9d4..081aef5abb 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -438,7 +438,7 @@ BOOL WINAPI PathRemoveFileSpecW(LPWSTR lpszPath) } /************************************************************************* - * PathStripPathA [SHELLWAPI.@] + * PathStripPathA [SHLWAPI.@] * * NOTES * removes the path from the beginning of a filename @@ -454,7 +454,7 @@ void WINAPI PathStripPathA(LPSTR lpszPath) } /************************************************************************* - * PathStripPathW [SHELLWAPI.@] + * PathStripPathW [SHLWAPI.@] */ void WINAPI PathStripPathW(LPWSTR lpszPath) { diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 2d3ccc4a41..8ee2e26620 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -115,7 +115,7 @@ BOOL WINAPI SHRegGetBoolUSValueW( } /************************************************************************* - * SHRegQueryUSValueA [SHLWAPI] + * SHRegQueryUSValueA [SHLWAPI.@] */ LONG WINAPI SHRegQueryUSValueA( HKEY hUSKey, /* [in] FIXME: HUSKEY */ @@ -132,7 +132,7 @@ LONG WINAPI SHRegQueryUSValueA( } /************************************************************************* - * SHRegQueryUSValueA [SHLWAPI] + * SHRegQueryUSValueW [SHLWAPI.@] */ LONG WINAPI SHRegQueryUSValueW( HKEY hUSKey, /* [in] FIXME: HUSKEY */ diff --git a/dlls/wineps/afm.c b/dlls/wineps/afm.c index fbe6a39d5c..1b4d6e357d 100644 --- a/dlls/wineps/afm.c +++ b/dlls/wineps/afm.c @@ -6,12 +6,16 @@ * */ +#include "config.h" + #include #include /* qsort() & bsearch() */ #include #include #include /* INT_MIN */ -#include /* FLT_MAX */ +#ifdef HAVE_FLOAT_H +# include /* FLT_MAX */ +#endif #include "winnt.h" /* HEAP_ZERO_MEMORY */ #include "psdrv.h" #include "options.h" diff --git a/dlls/wineps/init.c b/dlls/wineps/init.c index 00cdbad8fb..6310472e53 100644 --- a/dlls/wineps/init.c +++ b/dlls/wineps/init.c @@ -6,6 +6,8 @@ * */ +#include "config.h" + #include #include diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index fd986f2179..f9c9b35926 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -1419,7 +1419,7 @@ UINT16 WINAPI auxGetDevCaps16(UINT16 uDeviceID, LPAUXCAPS16 lpCaps, UINT16 uSize } /************************************************************************** - * auxGetVolume [WINM.23] + * auxGetVolume [WINMM.23] */ UINT WINAPI auxGetVolume(UINT uDeviceID, DWORD* lpdwVolume) { @@ -2117,7 +2117,7 @@ UINT MMSYSTEM_midiOutOpen(HMIDIOUT* lphMidiOut, UINT uDeviceID, DWORD dwCallback } /************************************************************************** - * midiOutOpen [WINM.84] + * midiOutOpen [WINMM.84] */ UINT WINAPI midiOutOpen(HMIDIOUT* lphMidiOut, UINT uDeviceID, DWORD dwCallback, DWORD dwInstance, DWORD dwFlags) @@ -2324,7 +2324,7 @@ UINT16 WINAPI midiOutReset16(HMIDIOUT16 hMidiOut) } /************************************************************************** - * midiOutGetVolume [WINM.81] + * midiOutGetVolume [WINMM.81] */ UINT WINAPI midiOutGetVolume(UINT uDeviceID, DWORD* lpdwVolume) { diff --git a/graphics/driver.c b/graphics/driver.c index 8d58616ad6..3ace2b932b 100644 --- a/graphics/driver.c +++ b/graphics/driver.c @@ -129,7 +129,7 @@ BOOL DRIVER_GetDriverName( LPCSTR device, LPSTR driver, DWORD size ) } /***************************************************************************** - * GDI_CallDevInstall16 [GDI32.100] + * @ [GDI32.100] * * This should thunk to 16-bit and simply call the proc with the given args. */ @@ -142,7 +142,7 @@ INT WINAPI GDI_CallDevInstall16( FARPROC16 lpfnDevInstallProc, HWND hWnd, } /***************************************************************************** - * GDI_CallExtDeviceModePropSheet16 [GDI32.101] + * @ [GDI32.101] * * This should load the correct driver for lpszDevice and calls this driver's * ExtDeviceModePropSheet proc. @@ -167,7 +167,7 @@ INT WINAPI GDI_CallExtDeviceModePropSheet16( HWND hWnd, LPCSTR lpszDevice, } /***************************************************************************** - * GDI_CallExtDeviceMode16 [GDI32.102] + * @ [GDI32.102] * * This should load the correct driver for lpszDevice and calls this driver's * ExtDeviceMode proc. @@ -192,7 +192,7 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, } /**************************************************************************** - * GDI_CallAdvancedSetupDialog16 [GDI32.103] + * @ [GDI32.103] * * This should load the correct driver for lpszDevice and calls this driver's * AdvancedSetupDialog proc. @@ -206,7 +206,7 @@ INT WINAPI GDI_CallAdvancedSetupDialog16( HWND hwnd, LPSTR lpszDevice, } /***************************************************************************** - * GDI_CallDeviceCapabilities16 [GDI32.104] + * @ [GDI32.104] * * This should load the correct driver for lpszDevice and calls this driver's * DeviceCapabilities proc. diff --git a/misc/cpu.c b/misc/cpu.c index 6063a2c8b7..227f7f415a 100644 --- a/misc/cpu.c +++ b/misc/cpu.c @@ -21,7 +21,7 @@ DEFAULT_DEBUG_CHANNEL(reg); static BYTE PF[64] = {0,}; /*********************************************************************** - * GetSystemInfo [KERNELL32.404] + * GetSystemInfo [KERNEL32.404] * * Gets the current system information. * @@ -220,7 +220,7 @@ VOID WINAPI GetSystemInfo( /*********************************************************************** - * IsProcessorFeaturePresent [KERNELL32.880] + * IsProcessorFeaturePresent [KERNEL32.880] * RETURNS: * TRUE if processorfeature present * FALSE otherwise