November 2008 - Wine-commits

Francois Gouget : wintrust: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 8bd8609af860ca5b5779d6fc7c9170cd087a163a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd8609af860ca5b5779d6fc7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 17:24:11 2008 +0100 wintrust: Remove WINAPI on static functions where not needed. --- dlls/wintrust/asn.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 0341a7c..4dfabc3 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -292,7 +292,7 @@ struct AsnEncodeSequenceItem DWORD size; /* used during encoding, not for your use */ }; -static BOOL WINAPI CRYPT_AsnEncodeSequence(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnEncodeSequence(DWORD dwCertEncodingType, struct AsnEncodeSequenceItem items[], DWORD cItem, BYTE *pbEncoded, DWORD *pcbEncoded) { @@ -779,7 +779,7 @@ static BOOL WINAPI CRYPT_AsnEncodeBMPString(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeInteger(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnEncodeInteger(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) { @@ -1126,7 +1126,7 @@ static BOOL WINAPI CRYPT_AsnDecodeOctets(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnDecodeSPCLinkInternal(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnDecodeSPCLinkInternal(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) {

1 0

Francois Gouget : wininet: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 523679666df58a4b23a6df9f6c9ee0e94a86f4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523679666df58a4b23a6df9f6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 17:24:22 2008 +0100 wininet: Remove WINAPI on static functions where not needed. --- dlls/wininet/ftp.c | 2 +- dlls/wininet/http.c | 2 +- dlls/wininet/urlcache.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 9ad34df..f351a02 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3220,7 +3220,7 @@ static void FTPFINDNEXT_Destroy(WININETHANDLEHEADER *hdr) HeapFree(GetProcessHeap(), 0, lpwfn); } -static DWORD WINAPI FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data) +static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data) { WIN32_FIND_DATAW *find_data = data; DWORD res = ERROR_SUCCESS; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 05e95eb..d43c9bb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -618,7 +618,7 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, /*********************************************************************** * HTTP_HttpAddRequestHeadersW (internal) */ -static BOOL WINAPI HTTP_HttpAddRequestHeadersW(LPWININETHTTPREQW lpwhr, +static BOOL HTTP_HttpAddRequestHeadersW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeader, DWORD dwHeaderLength, DWORD dwModifier) { LPWSTR lpszStart; diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 1d1beaf..b353302 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2335,7 +2335,7 @@ BOOL WINAPI CreateUrlCacheEntryW( * result will lose data for arbitrary binary data. * */ -static BOOL WINAPI CommitUrlCacheEntryInternal( +static BOOL CommitUrlCacheEntryInternal( IN LPCWSTR lpszUrlName, IN LPCWSTR lpszLocalFileName, IN FILETIME ExpireTime,

1 0

Francois Gouget : version: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 0ee5d5707925c944a368dfffe88c329edf49a574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee5d5707925c944a368dfffe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 17:24:38 2008 +0100 version: Remove WINAPI on static functions where not needed. --- dlls/version/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index cad3251..6036f38 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -676,7 +676,7 @@ static const VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( const VS_VERSION * * Gets a value from a 16-bit NE resource */ -static BOOL WINAPI VersionInfo16_QueryValue( const VS_VERSION_INFO_STRUCT16 *info, LPCSTR lpSubBlock, +static BOOL VersionInfo16_QueryValue( const VS_VERSION_INFO_STRUCT16 *info, LPCSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { while ( *lpSubBlock ) @@ -720,7 +720,7 @@ static BOOL WINAPI VersionInfo16_QueryValue( const VS_VERSION_INFO_STRUCT16 *inf * * Gets a value from a 32-bit PE resource */ -static BOOL WINAPI VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *info, LPCWSTR lpSubBlock, +static BOOL VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *info, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { TRACE("lpSubBlock : (%s)\n", debugstr_w(lpSubBlock));

1 0

Francois Gouget : wineoss: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: ec6f88b5c40e5050d65d37357ce095c7b199ce30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6f88b5c40e5050d65d37357… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 17:24:29 2008 +0100 wineoss: Remove WINAPI on static functions where not needed. --- dlls/wineoss.drv/dscapture.c | 8 ++++---- dlls/wineoss.drv/dsrender.c | 36 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wineoss.drv/dscapture.c b/dlls/wineoss.drv/dscapture.c index e474936..e058c26 100644 --- a/dlls/wineoss.drv/dscapture.c +++ b/dlls/wineoss.drv/dscapture.c @@ -138,11 +138,11 @@ struct IDsCaptureDriverBufferImpl int fd; }; -static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_Create( +static HRESULT IDsCaptureDriverPropertySetImpl_Create( IDsCaptureDriverBufferImpl * dscdb, IDsCaptureDriverPropertySetImpl **pdscdps); -static HRESULT WINAPI IDsCaptureDriverNotifyImpl_Create( +static HRESULT IDsCaptureDriverNotifyImpl_Create( IDsCaptureDriverBufferImpl * dsdcb, IDsCaptureDriverNotifyImpl **pdscdn); @@ -1232,7 +1232,7 @@ static const IDsCaptureDriverVtbl dscdvt = IDsCaptureDriverImpl_CreateCaptureBuffer }; -static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_Create( +static HRESULT IDsCaptureDriverPropertySetImpl_Create( IDsCaptureDriverBufferImpl * dscdb, IDsCaptureDriverPropertySetImpl **pdscdps) { @@ -1255,7 +1255,7 @@ static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_Create( return DS_OK; } -static HRESULT WINAPI IDsCaptureDriverNotifyImpl_Create( +static HRESULT IDsCaptureDriverNotifyImpl_Create( IDsCaptureDriverBufferImpl * dscdb, IDsCaptureDriverNotifyImpl **pdscdn) { diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c index 563f86d..57e3dd1 100644 --- a/dlls/wineoss.drv/dsrender.c +++ b/dlls/wineoss.drv/dsrender.c @@ -132,11 +132,11 @@ struct IDsDriverBufferImpl IDsDriverPropertySetImpl* property_set; }; -static HRESULT WINAPI IDsDriverPropertySetImpl_Create( +static HRESULT IDsDriverPropertySetImpl_Create( IDsDriverBufferImpl * dsdb, IDsDriverPropertySetImpl **pdsdps); -static HRESULT WINAPI IDsDriverNotifyImpl_Create( +static HRESULT IDsDriverNotifyImpl_Create( IDsDriverBufferImpl * dsdb, IDsDriverNotifyImpl **pdsdn); @@ -765,13 +765,13 @@ static HRESULT WINAPI IDsDriverImpl_GetCaps(PIDSDRIVER iface, PDSDRIVERCAPS pCap return DS_OK; } -static HRESULT WINAPI DSD_CreatePrimaryBuffer(PIDSDRIVER iface, - LPWAVEFORMATEX pwfx, - DWORD dwFlags, - DWORD dwCardAddress, - LPDWORD pdwcbBufferSize, - LPBYTE *ppbBuffer, - LPVOID *ppvObj) +static HRESULT DSD_CreatePrimaryBuffer(PIDSDRIVER iface, + LPWAVEFORMATEX pwfx, + DWORD dwFlags, + DWORD dwCardAddress, + LPDWORD pdwcbBufferSize, + LPBYTE *ppbBuffer, + LPVOID *ppvObj) { IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; @@ -832,13 +832,13 @@ static HRESULT WINAPI DSD_CreatePrimaryBuffer(PIDSDRIVER iface, return DS_OK; } -static HRESULT WINAPI DSD_CreateSecondaryBuffer(PIDSDRIVER iface, - LPWAVEFORMATEX pwfx, - DWORD dwFlags, - DWORD dwCardAddress, - LPDWORD pdwcbBufferSize, - LPBYTE *ppbBuffer, - LPVOID *ppvObj) +static HRESULT DSD_CreateSecondaryBuffer(PIDSDRIVER iface, + LPWAVEFORMATEX pwfx, + DWORD dwFlags, + DWORD dwCardAddress, + LPDWORD pdwcbBufferSize, + LPBYTE *ppbBuffer, + LPVOID *ppvObj) { IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; @@ -886,7 +886,7 @@ static const IDsDriverVtbl dsdvt = IDsDriverImpl_DuplicateSoundBuffer }; -static HRESULT WINAPI IDsDriverPropertySetImpl_Create( +static HRESULT IDsDriverPropertySetImpl_Create( IDsDriverBufferImpl * dsdb, IDsDriverPropertySetImpl **pdsdps) { @@ -909,7 +909,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_Create( return DS_OK; } -static HRESULT WINAPI IDsDriverNotifyImpl_Create( +static HRESULT IDsDriverNotifyImpl_Create( IDsDriverBufferImpl * dsdb, IDsDriverNotifyImpl **pdsdn) {

1 0

Francois Gouget : shlwapi: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: a3973e0c476290e4aabfc9801dcd61a9acd8a597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3973e0c476290e4aabfc9801… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 17:22:44 2008 +0100 shlwapi: Remove WINAPI on static functions where not needed. --- dlls/shlwapi/ordinal.c | 9 ++++----- dlls/shlwapi/path.c | 8 ++++---- dlls/shlwapi/reg.c | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 495b444..68e934f 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -76,10 +76,9 @@ BOOL WINAPI SHAboutInfoW(LPWSTR,DWORD); * * Internal implemetation of SHLWAPI_11. */ -static -HANDLE WINAPI SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, - DWORD dwSrcProcId, DWORD dwAccess, - DWORD dwOptions) +static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, + DWORD dwSrcProcId, DWORD dwAccess, + DWORD dwOptions) { HANDLE hDst, hSrc; DWORD dwMyProcId = GetCurrentProcessId(); @@ -3546,7 +3545,7 @@ HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHC } /* INTERNAL: Map from HLS color space to RGB */ -static WORD WINAPI ConvertHue(int wHue, WORD wMid1, WORD wMid2) +static WORD ConvertHue(int wHue, WORD wMid1, WORD wMid2) { wHue = wHue > 240 ? wHue - 240 : wHue < 0 ? wHue + 240 : wHue; diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index e06e027..5e95d5c 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1156,7 +1156,7 @@ BOOL WINAPI PathFileExistsDefExtA(LPSTR lpszPath,DWORD dwWhich) * * Internal helper for SHLWAPI_PathFindOnPathExA/W. */ -static BOOL WINAPI SHLWAPI_PathFindInOtherDirs(LPWSTR lpszFile, DWORD dwWhich) +static BOOL SHLWAPI_PathFindInOtherDirs(LPWSTR lpszFile, DWORD dwWhich) { static const WCHAR szSystem[] = { 'S','y','s','t','e','m','\0'}; static const WCHAR szPath[] = { 'P','A','T','H','\0'}; @@ -1792,7 +1792,7 @@ BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR lpszPath, DWORD *dwAttr) /************************************************************************* * PathMatchSingleMaskA [internal] */ -static BOOL WINAPI PathMatchSingleMaskA(LPCSTR name, LPCSTR mask) +static BOOL PathMatchSingleMaskA(LPCSTR name, LPCSTR mask) { while (*name && *mask && *mask!=';') { @@ -1826,7 +1826,7 @@ static BOOL WINAPI PathMatchSingleMaskA(LPCSTR name, LPCSTR mask) /************************************************************************* * PathMatchSingleMaskW [internal] */ -static BOOL WINAPI PathMatchSingleMaskW(LPCWSTR name, LPCWSTR mask) +static BOOL PathMatchSingleMaskW(LPCWSTR name, LPCWSTR mask) { while (*name && *mask && *mask != ';') { @@ -2991,7 +2991,7 @@ UINT WINAPI PathGetCharTypeW(WCHAR ch) * * Internal helper for PathMakeSystemFolderW. */ -static BOOL WINAPI SHLWAPI_UseSystemForSystemFolders(void) +static BOOL SHLWAPI_UseSystemForSystemFolders(void) { static BOOL bCheckedReg = FALSE; static BOOL bUseSystemForSystemFolders = FALSE; diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 07384ea..70a5e14 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -66,7 +66,7 @@ HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID,LPCWSTR,BOOL,BOOL,PHKEY); * Function: Return the proper registry key from the HUSKEY structure * also allow special predefined values. */ -static HKEY WINAPI REG_GetHKEYFromHUSKEY(HUSKEY hUSKey, BOOL which) +static HKEY REG_GetHKEYFromHUSKEY(HUSKEY hUSKey, BOOL which) { HKEY test = hUSKey; LPSHUSKEY mihk = hUSKey;

1 0

Francois Gouget : wined3d: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: c0e271c4de0d4ef90e702757b49222deff394d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e271c4de0d4ef90e702757b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 17:23:10 2008 +0100 wined3d: Remove WINAPI on static functions where not needed. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/surface.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0cb539b..be0bdb2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -52,7 +52,7 @@ const WINED3DLIGHT WINED3D_default_light = { }; /* static function declarations */ -static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource); +static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource); /* helper macros */ #define D3DMEMCHECK(object, ppResult) if(NULL == object) { *ppResult = NULL; WARN("Out of memory\n"); return WINED3DERR_OUTOFVIDEOMEMORY;} @@ -1311,7 +1311,7 @@ static LONG fullscreen_exStyle(LONG orig_exStyle) { return exStyle; } -static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *iface, HWND window, UINT w, UINT h) { +static void IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *iface, HWND window, UINT w, UINT h) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; LONG style, exStyle; @@ -1355,7 +1355,7 @@ static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *ifac * window: Window to setup * *****************************************************************************/ -static void WINAPI IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND window) { +static void IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND window) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; LONG style, exStyle; @@ -7318,14 +7318,14 @@ static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT i * any handles to other resource held by the caller must be closed * (e.g. a texture should release all held surfaces because telling the device that it's been released.) *****************************************************/ -static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource){ +static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : Adding Resource %p\n", This, resource); list_add_head(&This->resources, &((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } -static void WINAPI IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWineD3DResource *resource){ +static void IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWineD3DResource *resource){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : Removing resource %p\n", This, resource); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 77f32ef..b147058 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3671,7 +3671,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx) +static HRESULT IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx) { IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; float depth;

1 0

Francois Gouget : msxml3: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 848b5092ba672a963bb8ee1c71e7661110607aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=848b5092ba672a963bb8ee1c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 17:23:59 2008 +0100 msxml3: Remove WINAPI on static functions where not needed. --- dlls/msxml3/saxreader.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 9fc226a..8370af0 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1866,7 +1866,7 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt return hr; } -static HRESULT WINAPI internal_getEntityResolver( +static HRESULT internal_getEntityResolver( saxreader *This, void *pEntityResolver, BOOL vbInterface) @@ -1875,7 +1875,7 @@ static HRESULT WINAPI internal_getEntityResolver( return E_NOTIMPL; } -static HRESULT WINAPI internal_putEntityResolver( +static HRESULT internal_putEntityResolver( saxreader *This, void *pEntityResolver, BOOL vbInterface) @@ -1884,7 +1884,7 @@ static HRESULT WINAPI internal_putEntityResolver( return E_NOTIMPL; } -static HRESULT WINAPI internal_getContentHandler( +static HRESULT internal_getContentHandler( saxreader* This, void *pContentHandler, BOOL vbInterface) @@ -1907,7 +1907,7 @@ static HRESULT WINAPI internal_getContentHandler( return S_OK; } -static HRESULT WINAPI internal_putContentHandler( +static HRESULT internal_putContentHandler( saxreader* This, void *contentHandler, BOOL vbInterface) @@ -1936,7 +1936,7 @@ static HRESULT WINAPI internal_putContentHandler( return S_OK; } -static HRESULT WINAPI internal_getDTDHandler( +static HRESULT internal_getDTDHandler( saxreader* This, void *pDTDHandler, BOOL vbInterface) @@ -1945,7 +1945,7 @@ static HRESULT WINAPI internal_getDTDHandler( return E_NOTIMPL; } -static HRESULT WINAPI internal_putDTDHandler( +static HRESULT internal_putDTDHandler( saxreader* This, void *pDTDHandler, BOOL vbInterface) @@ -1954,7 +1954,7 @@ static HRESULT WINAPI internal_putDTDHandler( return E_NOTIMPL; } -static HRESULT WINAPI internal_getErrorHandler( +static HRESULT internal_getErrorHandler( saxreader* This, void *pErrorHandler, BOOL vbInterface) @@ -1977,7 +1977,7 @@ static HRESULT WINAPI internal_getErrorHandler( } -static HRESULT WINAPI internal_putErrorHandler( +static HRESULT internal_putErrorHandler( saxreader* This, void *errorHandler, BOOL vbInterface) @@ -2005,7 +2005,7 @@ static HRESULT WINAPI internal_putErrorHandler( } -static HRESULT WINAPI internal_parse( +static HRESULT internal_parse( saxreader* This, VARIANT varInput, BOOL vbInterface) @@ -2091,7 +2091,7 @@ static HRESULT internal_onDataAvailable(void *obj, char *ptr, DWORD len) return internal_parseBuffer(This, ptr, len, FALSE); } -static HRESULT WINAPI internal_parseURL( +static HRESULT internal_parseURL( saxreader* This, const WCHAR *url, BOOL vbInterface) @@ -2112,7 +2112,7 @@ static HRESULT WINAPI internal_parseURL( return S_OK; } -static HRESULT WINAPI internal_putProperty( +static HRESULT internal_putProperty( saxreader* This, const WCHAR *pProp, VARIANT value,

1 0

Francois Gouget : user32: Remove WINAPI/ CALLBACK on static functions where not needed.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 31df4d42b7388fda19c52f11476c5e56b04e2964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31df4d42b7388fda19c52f114… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 17:23:35 2008 +0100 user32: Remove WINAPI/CALLBACK on static functions where not needed. --- dlls/user32/button.c | 4 ++-- dlls/user32/edit.c | 8 ++++---- dlls/user32/listbox.c | 4 ++-- dlls/user32/tests/class.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 25a94a3..84b54ab 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -229,8 +229,8 @@ static void setup_clipping( HWND hwnd, HDC hdc ) /*********************************************************************** * ButtonWndProc_common */ -static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { RECT rect; POINT pt; diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 97ee3a8..6914906 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -223,7 +223,7 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es); static void EDIT_SetRectNP(EDITSTATE *es, const RECT *lprc); static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force); static void EDIT_UpdateScrollInfo(EDITSTATE *es); -static INT CALLBACK EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action); +static INT EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action); /* * EM_XXX message handlers */ @@ -449,8 +449,8 @@ static inline INT get_vertical_line_count(EDITSTATE *es) * names). * */ -static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +static LRESULT EditWndProc_common( HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; @@ -2602,7 +2602,7 @@ static void EDIT_UpdateScrollInfo(EDITSTATE *es) * internally, so we can decide this for ourselves. * */ -static INT CALLBACK EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action) +static INT EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action) { INT ret = 0; diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 0c24e71..9b2378d 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2606,8 +2606,8 @@ static BOOL LISTBOX_Destroy( LB_DESCR *descr ) /*********************************************************************** * ListBoxWndProc_common */ -static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +static LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); LPHEADCOMBO lphc = 0; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 20035cb..ce6d020 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -814,7 +814,7 @@ static BOOL RegisterTestDialog(HINSTANCE hInstance) /* test registering a dialog box created by using the CLASS directive in a resource file, then test creating the dialog using CreateDialogParam. */ -static void WINAPI CreateDialogParamTest(HINSTANCE hInstance) +static void CreateDialogParamTest(HINSTANCE hInstance) { HWND hWndMain;

1 0

Ricardo Filipe : quartz: Removed dead code and variables (llvm/clang).
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: abe85bcb99ecd4d3b41f7c42b7e476f38c39736d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe85bcb99ecd4d3b41f7c42b… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Sun Nov 23 01:17:46 2008 +0000 quartz: Removed dead code and variables (llvm/clang). --- dlls/quartz/videorenderer.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index c7d6582..acd0ba2 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -274,9 +274,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, AM_MEDIA_TYPE amt; HRESULT hr = S_OK; DDSURFACEDESC sdesc; - int width; - int height; - LPBYTE palette = NULL; HDC hDC; BITMAPINFOHEADER *bmiHeader; @@ -312,10 +309,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - width = bmiHeader->biWidth; - height = bmiHeader->biHeight; - palette = ((LPBYTE)bmiHeader) + bmiHeader->biSize; - if (!This->init) { if (!This->WindowPos.right || !This->WindowPos.bottom)

1 0

Vincent Povirk : setupapi: Implement FLG_PROFITEM_GROUP.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: b7fe5e0aa587f450e6d70f2994be92ecf85fc809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7fe5e0aa587f450e6d70f299… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 13 10:33:09 2008 -0600 setupapi: Implement FLG_PROFITEM_GROUP. --- dlls/setupapi/install.c | 106 ++++++++++++++++++++++------------------ dlls/setupapi/tests/install.c | 8 +++- include/setupapi.h | 5 ++ 3 files changed, 70 insertions(+), 49 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 133fb33..b68aa0b 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -787,9 +787,6 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) LPWSTR cmdline=NULL, lnkpath_end; unsigned int name_size; INFCONTEXT name_context, context; - IShellLinkW* shelllink=NULL; - IPersistFile* persistfile=NULL; - HRESULT initresult=E_FAIL; int attrs=0; static const WCHAR dotlnk[] = {'.','l','n','k',0}; @@ -799,7 +796,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) if (SetupFindFirstLineW( hinf, field, Name, &name_context )) { SetupGetIntField( &name_context, 2, &attrs ); - if (attrs) FIXME( "unhandled attributes: %x\n", attrs ); + if (attrs & ~FLG_PROFITEM_GROUP) FIXME( "unhandled attributes: %x\n", attrs ); } else return TRUE; @@ -808,7 +805,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) lnkpath_end = lnkpath + strlenW(lnkpath); if (lnkpath_end[-1] != '\\') *lnkpath_end++ = '\\'; - if (SetupFindFirstLineW( hinf, field, SubDir, &context )) + if (!(attrs & FLG_PROFITEM_GROUP) && SetupFindFirstLineW( hinf, field, SubDir, &context )) { unsigned int subdir_size; @@ -823,67 +820,80 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) return TRUE; lnkpath_end += name_size - 1; - if (lnkpath+MAX_PATH < lnkpath_end + 5) return TRUE; - strcpyW( lnkpath_end, dotlnk ); - TRACE( "link path: %s\n", debugstr_w(lnkpath) ); - - /* calculate command line */ - if (SetupFindFirstLineW( hinf, field, CmdLine, &context )) + if (attrs & FLG_PROFITEM_GROUP) { - unsigned int dir_len=0, subdir_size=0, filename_size=0; - int dirid=0; - LPCWSTR dir; - LPWSTR cmdline_end; - - SetupGetIntField( &context, 1, &dirid ); - dir = DIRID_get_string( dirid ); + SHPathPrepareForWriteW( NULL, NULL, lnkpath, SHPPFW_DIRCREATE ); + } + else + { + IShellLinkW* shelllink=NULL; + IPersistFile* persistfile=NULL; + HRESULT initresult=E_FAIL; - if (dir) dir_len = strlenW(dir); + if (lnkpath+MAX_PATH < lnkpath_end + 5) return TRUE; + strcpyW( lnkpath_end, dotlnk ); - SetupGetStringFieldW( &context, 2, NULL, 0, &subdir_size ); - SetupGetStringFieldW( &context, 3, NULL, 0, &filename_size ); + TRACE( "link path: %s\n", debugstr_w(lnkpath) ); - if (dir_len && filename_size) + /* calculate command line */ + if (SetupFindFirstLineW( hinf, field, CmdLine, &context )) { - cmdline = cmdline_end = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * (dir_len+subdir_size+filename_size+1) ); + unsigned int dir_len=0, subdir_size=0, filename_size=0; + int dirid=0; + LPCWSTR dir; + LPWSTR cmdline_end; - strcpyW( cmdline_end, dir ); - cmdline_end += dir_len; - if (cmdline_end[-1] != '\\') *cmdline_end++ = '\\'; + SetupGetIntField( &context, 1, &dirid ); + dir = DIRID_get_string( dirid ); - if (subdir_size) + if (dir) dir_len = strlenW(dir); + + SetupGetStringFieldW( &context, 2, NULL, 0, &subdir_size ); + SetupGetStringFieldW( &context, 3, NULL, 0, &filename_size ); + + if (dir_len && filename_size) { - SetupGetStringFieldW( &context, 2, cmdline_end, subdir_size, NULL ); - cmdline_end += subdir_size-1; + cmdline = cmdline_end = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * (dir_len+subdir_size+filename_size+1) ); + + strcpyW( cmdline_end, dir ); + cmdline_end += dir_len; if (cmdline_end[-1] != '\\') *cmdline_end++ = '\\'; + + if (subdir_size) + { + SetupGetStringFieldW( &context, 2, cmdline_end, subdir_size, NULL ); + cmdline_end += subdir_size-1; + if (cmdline_end[-1] != '\\') *cmdline_end++ = '\\'; + } + SetupGetStringFieldW( &context, 3, cmdline_end, filename_size, NULL ); + TRACE( "cmdline: %s\n", debugstr_w(cmdline)); } - SetupGetStringFieldW( &context, 3, cmdline_end, filename_size, NULL ); - TRACE( "cmdline: %s\n", debugstr_w(cmdline)); } - } - if (!cmdline) return TRUE; + if (!cmdline) return TRUE; - initresult = CoInitialize(NULL); + initresult = CoInitialize(NULL); - if (!SUCCEEDED(CoCreateInstance( &CLSID_ShellLink, NULL, - CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&shelllink))) - goto done; + if (!SUCCEEDED(CoCreateInstance( &CLSID_ShellLink, NULL, + CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&shelllink))) + goto done; - IShellLinkW_SetPath( shelllink, cmdline ); - SHPathPrepareForWriteW( NULL, NULL, lnkpath, SHPPFW_DIRCREATE|SHPPFW_IGNOREFILENAME ); - if (SUCCEEDED(IShellLinkW_QueryInterface( shelllink, &IID_IPersistFile, (LPVOID*)&persistfile))) - { - TRACE( "writing link: %s\n", debugstr_w(lnkpath) ); - IPersistFile_Save( persistfile, lnkpath, FALSE ); - IPersistFile_Release( persistfile ); + IShellLinkW_SetPath( shelllink, cmdline ); + SHPathPrepareForWriteW( NULL, NULL, lnkpath, SHPPFW_DIRCREATE|SHPPFW_IGNOREFILENAME ); + if (SUCCEEDED(IShellLinkW_QueryInterface( shelllink, &IID_IPersistFile, (LPVOID*)&persistfile))) + { + TRACE( "writing link: %s\n", debugstr_w(lnkpath) ); + IPersistFile_Save( persistfile, lnkpath, FALSE ); + IPersistFile_Release( persistfile ); + } + IShellLinkW_Release( shelllink ); + + done: + if (SUCCEEDED(initresult)) CoUninitialize(); + HeapFree( GetProcessHeap(), 0, cmdline ); } - IShellLinkW_Release( shelllink ); -done: - if (SUCCEEDED(initresult)) CoUninitialize(); - HeapFree( GetProcessHeap(), 0, cmdline ); return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 9be46fe..981dce3 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -393,7 +393,7 @@ static void test_profile_items(void) "[Version]\n" "Signature=\"$Chicago$\"\n" "[DefaultInstall]\n" - "ProfileItems=TestItem,TestItem2\n" + "ProfileItems=TestItem,TestItem2,TestGroup\n" "[TestItem]\n" "Name=TestItem\n" "CmdLine=11,,notepad.exe\n" @@ -401,6 +401,8 @@ static void test_profile_items(void) "Name=TestItem2\n" "CmdLine=11,,notepad.exe\n" "SubDir=TestDir\n" + "[TestGroup]\n" + "Name=TestGroup,4\n" ; hShell32 = LoadLibraryA("shell32"); @@ -432,6 +434,8 @@ static void test_profile_items(void) ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "directory not created\n"); snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "link not created\n"); + snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "group not created\n"); } snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); @@ -442,6 +446,8 @@ static void test_profile_items(void) DeleteFile(path); snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); RemoveDirectory(path); + snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); + RemoveDirectory(path); cleanup: if (hShell32) FreeLibrary(hShell32); diff --git a/include/setupapi.h b/include/setupapi.h index cb680d2..88c35eb 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1054,6 +1054,11 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define FLG_REGSVR_DLLREGISTER 0x00000001 #define FLG_REGSVR_DLLINSTALL 0x00000002 +#define FLG_PROFITEM_CURRENTUSER 0x00000001 +#define FLG_PROFITEM_DELETE 0x00000002 +#define FLG_PROFITEM_GROUP 0x00000004 +#define FLG_PROFITEM_CSIDL 0x00000008 + #define DI_NOVCP 0x00000008 /* Class installer function codes */

1 0