ChangeSet ID: 21059 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@winehq.org 2005/11/02 14:51:41
Modified files: dlls/shell32 : shelllink.c dlls/opengl32 : wgl.c
Log message: Martin Fuchs martin-fuchs@gmx.net Correct WINAPI position for MSVC portability.
Patch: http://cvs.winehq.org/patch.py?id=21059
Old revision New revision Changes Path 1.108 1.109 +2 -2 wine/dlls/shell32/shelllink.c 1.64 1.65 +1 -1 wine/dlls/opengl32/wgl.c
Index: wine/dlls/shell32/shelllink.c diff -u -p wine/dlls/shell32/shelllink.c:1.108 wine/dlls/shell32/shelllink.c:1.109 --- wine/dlls/shell32/shelllink.c:1.108 2 Nov 2005 20:51:41 -0000 +++ wine/dlls/shell32/shelllink.c 2 Nov 2005 20:51:41 -0000 @@ -2415,8 +2415,8 @@ ShellLink_QueryContextMenu( IContextMenu
static LPWSTR shelllink_get_msi_component_path( LPCWSTR component ) { - UINT WINAPI (*pMsiDecomposeDescriptorW)(LPCWSTR,LPWSTR,LPWSTR,LPWSTR,DWORD*); - INSTALLSTATE WINAPI (*pMsiGetComponentPathW)(LPCWSTR,LPCWSTR,LPWSTR,DWORD*); + UINT (WINAPI *pMsiDecomposeDescriptorW)(LPCWSTR,LPWSTR,LPWSTR,LPWSTR,DWORD*); + INSTALLSTATE (WINAPI *pMsiGetComponentPathW)(LPCWSTR,LPCWSTR,LPWSTR,DWORD*); WCHAR szProd[MAX_FEATURE_CHARS+1], szFeat[MAX_FEATURE_CHARS+1], szComp[MAX_FEATURE_CHARS+1], szCompPath[MAX_PATH]; INSTALLSTATE state; Index: wine/dlls/opengl32/wgl.c diff -u -p wine/dlls/opengl32/wgl.c:1.64 wine/dlls/opengl32/wgl.c:1.65 --- wine/dlls/opengl32/wgl.c:1.64 2 Nov 2005 20:51:41 -0000 +++ wine/dlls/opengl32/wgl.c 2 Nov 2005 20:51:41 -0000 @@ -582,7 +582,7 @@ static BOOL internal_wglUseFontBitmaps(H DWORD first, DWORD count, DWORD listBase, - DWORD WINAPI (*GetGlyphOutline_ptr)(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*)) + DWORD (WINAPI *GetGlyphOutline_ptr)(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*)) { /* We are running using client-side rendering fonts... */ GLYPHMETRICS gm;