November 2008 - Wine-commits

Hans Leidekker : gdiplus: Improve GdipMeasureString.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 1e170c9b85c39d2b789f7f44f8fc692af94ffa4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e170c9b85c39d2b789f7f44f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:22:26 2008 +0100 gdiplus: Improve GdipMeasureString. --- dlls/gdiplus/graphics.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index fa90d73..aba2aca 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2654,10 +2654,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics || !string || !font || !rect) return InvalidParameter; - if(codepointsfitted || linesfilled){ - FIXME("not implemented for given parameters\n"); - return NotImplemented; - } + if(linesfilled) *linesfilled = 0; + if(codepointsfitted) *codepointsfitted = 0; if(format) TRACE("may be ignoring some format flags: attr %x\n", format->attr); @@ -2722,7 +2720,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, nwidth, &j, NULL, &size); sum += fit + (lret < fitcpy ? 1 : 0); + if(codepointsfitted) *codepointsfitted = sum; + height += size.cy; + if(linesfilled) *linesfilled += size.cy; max_width = max(max_width, size.cx); if(height > nheight)

1 0

Hans Leidekker : gdiplus: Implement GdipGetFontCollectionFamilyCount and GdipGetFontCollectionFamilyList .
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 80a54ca53f8fc1526210f2023b62713223552c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a54ca53f8fc1526210f2023… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:22:17 2008 +0100 gdiplus: Implement GdipGetFontCollectionFamilyCount and GdipGetFontCollectionFamilyList. --- dlls/gdiplus/font.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 829dc57..ba2f1d8 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -854,12 +854,13 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount( GpFontCollection* fontCollection, INT* numFound) { - FIXME("stub: %p, %p\n", fontCollection, numFound); + TRACE("%p, %p\n", fontCollection, numFound); if (!(fontCollection && numFound)) return InvalidParameter; - return NotImplemented; + *numFound = fontCollection->count; + return Ok; } /***************************************************************************** @@ -869,13 +870,19 @@ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList( GpFontCollection* fontCollection, INT numSought, GpFontFamily* gpfamilies[], INT* numFound) { - FIXME("stub: %p, %d, %p, %p\n", fontCollection, numSought, gpfamilies, - numFound); + INT i; + + TRACE("%p, %d, %p, %p\n", fontCollection, numSought, gpfamilies, numFound); if (!(fontCollection && gpfamilies && numFound)) return InvalidParameter; - return NotImplemented; + for (i = 0; i < numSought && i < fontCollection->count; i++) + { + gpfamilies[i] = fontCollection->FontFamilies[i]; + } + *numFound = i; + return Ok; } GpStatus WINGDIPAPI GdipNewInstalledFontCollection(

1 0

Hans Leidekker : gdiplus: Add a stub implementation of GdipPrivateAddMemoryFont.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 2b8c6fe4db90736a99a8459d0f904f726b14e4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8c6fe4db90736a99a8459d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:22:06 2008 +0100 gdiplus: Add a stub implementation of GdipPrivateAddMemoryFont. --- dlls/gdiplus/font.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 71df288..829dc57 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -835,6 +835,20 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection* fontCollection, } /***************************************************************************** + * GdipPrivateAddMemoryFont [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, + GDIPCONST void* memory, INT length) +{ + FIXME("%p, %p, %d\n", fontCollection, memory, length); + + if (!(fontCollection && memory && length)) + return InvalidParameter; + + return Ok; +} + +/***************************************************************************** * GdipGetFontCollectionFamilyCount [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount( diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7a303af..c61a914 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -465,7 +465,7 @@ @ stub GdipPlayMetafileRecord @ stub GdipPlayTSClientRecord @ stdcall GdipPrivateAddFontFile(ptr wstr) -@ stub GdipPrivateAddMemoryFont +@ stdcall GdipPrivateAddMemoryFont(ptr ptr long) @ stub GdipRecordMetafile @ stdcall GdipRecordMetafileFileName(wstr long long ptr long wstr ptr) @ stdcall GdipRecordMetafileFileNameI(wstr long long ptr long wstr ptr)

1 0

Hans Leidekker : gdiplus: Implement GdipNewPrivateFontCollection and GdipDeletePrivateFontCollection .
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: ea323d1349bbe5ae59d18af620dd7f24242b3547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea323d1349bbe5ae59d18af62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:21:55 2008 +0100 gdiplus: Implement GdipNewPrivateFontCollection and GdipDeletePrivateFontCollection. --- dlls/gdiplus/font.c | 18 ++++++++++++++---- dlls/gdiplus/gdiplus_private.h | 3 ++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 9348f5b..71df288 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -789,12 +789,17 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamil */ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollection) { - FIXME("stub %p\n", fontCollection); + TRACE("%p\n", fontCollection); if (!fontCollection) return InvalidParameter; - return NotImplemented; + *fontCollection = GdipAlloc(sizeof(GpFontCollection)); + if (!*fontCollection) return OutOfMemory; + + (*fontCollection)->FontFamilies = NULL; + (*fontCollection)->count = 0; + return Ok; } /***************************************************************************** @@ -802,12 +807,17 @@ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollecti */ GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontCollection) { - FIXME("stub %p\n", fontCollection); + INT i; + + TRACE("%p\n", fontCollection); if (!fontCollection) return InvalidParameter; - return NotImplemented; + for (i = 0; i < (*fontCollection)->count; i++) GdipFree((*fontCollection)->FontFamilies[i]); + GdipFree(*fontCollection); + + return Ok; } /***************************************************************************** diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 57d63c2..2dde79b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -225,7 +225,8 @@ struct GpStringFormat{ }; struct GpFontCollection{ - GpFontFamily* FontFamilies; + GpFontFamily **FontFamilies; + INT count; }; struct GpFontFamily{

1 0

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

24 Nov '08

Module: wine Branch: master Commit: fcfe436de5f9424b304d70a73f4cb6784304b834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcfe436de5f9424b304d70a73… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 00:29:18 2008 +0100 ddraw: Remove WINAPI on static functions where not needed. --- dlls/ddraw/ddraw.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ddb7d3a..4f23722 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -46,9 +46,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static BOOL IDirectDrawImpl_DDSD_Match(const DDSURFACEDESC2* requested, const DDSURFACEDESC2* provided); -static HRESULT WINAPI IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, IDirectDrawSurfaceImpl *primary); -static HRESULT WINAPI IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD, IDirectDrawSurfaceImpl **ppSurf, UINT level); -static HRESULT WINAPI IDirectDrawImpl_CreateGDISwapChain(IDirectDrawImpl *This, IDirectDrawSurfaceImpl *primary); +static HRESULT IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, IDirectDrawSurfaceImpl *primary); +static HRESULT IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD, IDirectDrawSurfaceImpl **ppSurf, UINT level); +static HRESULT IDirectDrawImpl_CreateGDISwapChain(IDirectDrawImpl *This, IDirectDrawSurfaceImpl *primary); /* Device identifier. Don't relay it to WineD3D */ static const DDDEVICEIDENTIFIER2 deviceidentifier = @@ -1936,7 +1936,7 @@ ULONG WINAPI D3D7CB_DestroyDepthStencilSurface(IWineD3DSurface *pSurface) { * DD_OK on success * *****************************************************************************/ -static HRESULT WINAPI +static HRESULT IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD, IDirectDrawSurfaceImpl **ppSurf, @@ -3212,7 +3212,7 @@ D3D7CB_CreateAdditionalSwapChain(IUnknown *device, return res; } -static HRESULT WINAPI IDirectDrawImpl_CreateGDISwapChain(IDirectDrawImpl *This, +static HRESULT IDirectDrawImpl_CreateGDISwapChain(IDirectDrawImpl *This, IDirectDrawSurfaceImpl *primary) { HRESULT hr; WINED3DPRESENT_PARAMETERS presentation_parameters; @@ -3267,7 +3267,7 @@ static HRESULT WINAPI IDirectDrawImpl_CreateGDISwapChain(IDirectDrawImpl *This, * DDERR_* otherwise * *****************************************************************************/ -static HRESULT WINAPI +static HRESULT IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, IDirectDrawSurfaceImpl *primary) {

1 0

Hans Leidekker : gdiplus: Implement GdipGetLineSpacing.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: c04b7c5b0f8dbe77bb88fc8915fff37b17982ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04b7c5b0f8dbe77bb88fc891… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:21:44 2008 +0100 gdiplus: Implement GdipGetLineSpacing. --- dlls/gdiplus/font.c | 14 +++++++++----- dlls/gdiplus/tests/font.c | 6 ------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 32713c7..9348f5b 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -667,8 +667,7 @@ GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, U { if (!(family && EmHeight)) return InvalidParameter; - TRACE("%p (%s), %d, %p, stub!\n", family, - debugstr_w(family->FamilyName), style, EmHeight); + TRACE("%p (%s), %d, %p\n", family, debugstr_w(family->FamilyName), style, EmHeight); *EmHeight = family->tmw.ntmSizeEM; @@ -693,11 +692,16 @@ GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, U GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, INT style, UINT16* LineSpacing) { - if (!(family && LineSpacing)) return InvalidParameter; + TRACE("%p, %d, %p\n", family, style, LineSpacing); - FIXME("stub!\n"); + if (!(family && LineSpacing)) + return InvalidParameter; - return NotImplemented; + if (style) FIXME("ignoring style\n"); + + *LineSpacing = family->tmw.tmAscent + family->tmw.tmDescent + family->tmw.tmExternalLeading; + + return Ok; } GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index ab6d28c..7ff5afc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -246,12 +246,9 @@ static void test_fontfamily_properties (void) skip("Arial not installed\n"); else { -todo_wine -{ stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok (result == 2355, "Expected 2355, got %d\n", result); -} result = 0; stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); expect(Ok, stat); @@ -272,12 +269,9 @@ todo_wine else { result = 0; -todo_wine -{ stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok(result == 2355, "Expected 2355, got %d\n", result); -} result = 0; stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); expect(Ok, stat);

1 0

Hans Leidekker : gdiplus: Add a stub implementation of GdiplusNotificationHook and GdiplusNotificationUnhook .
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 67a9170aca4be92635b160a0f1b73c39dff2fb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a9170aca4be92635b160a0f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:21:28 2008 +0100 gdiplus: Add a stub implementation of GdiplusNotificationHook and GdiplusNotificationUnhook. --- dlls/gdiplus/gdiplus.c | 12 ++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 79b9ca0..c9c3102 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -100,6 +100,18 @@ Status WINAPI GdiplusStartup(ULONG_PTR *token, const struct GdiplusStartupInput return Ok; } +GpStatus WINAPI GdiplusNotificationHook(ULONG_PTR *token) +{ + FIXME("%p\n", token); + return NotificationHook(token); +} + +void WINAPI GdiplusNotificationUnhook(ULONG_PTR token) +{ + FIXME("%ld\n", token); + return NotificationUnhook(token); +} + /***************************************************** * GdiplusShutdown [GDIPLUS.@] */ diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c25d4b7..7a303af 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -624,7 +624,7 @@ @ stub GdipWarpPath @ stub GdipWidenPath @ stub GdipWindingModeOutline -@ stub GdiplusNotificationHook -@ stub GdiplusNotificationUnhook +@ stdcall GdiplusNotificationHook(ptr) +@ stdcall GdiplusNotificationUnhook(ptr) @ stdcall GdiplusShutdown(ptr) @ stdcall GdiplusStartup(ptr ptr ptr)

1 0

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

24 Nov '08

Module: wine Branch: master Commit: d3c7b2f7cc010022a7f1b301ce9185edccd3b39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c7b2f7cc010022a7f1b301c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 00:28:49 2008 +0100 d3d8: Remove WINAPI on static functions where not needed. --- dlls/d3d8/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 64e3b60..b607358 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -632,7 +632,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(LPDIRECT3DDEVICE8 i return hrc; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface8 **ppSurface,D3DRESOURCETYPE Type, UINT Usage,D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality) { +static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface8 **ppSurface,D3DRESOURCETYPE Type, UINT Usage,D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality) { HRESULT hrc; IDirect3DSurface8Impl *object; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; @@ -1482,7 +1482,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ProcessVertices(LPDIRECT3DDEVICE8 ifa return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexDeclaration(IDirect3DDevice8 *iface, CONST DWORD *declaration, IDirect3DVertexDeclaration8 **decl_ptr) { +static HRESULT IDirect3DDevice8Impl_CreateVertexDeclaration(IDirect3DDevice8 *iface, CONST DWORD *declaration, IDirect3DVertexDeclaration8 **decl_ptr) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexDeclaration8Impl *object; WINED3DVERTEXELEMENT *wined3d_elements;

1 0

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

24 Nov '08

Module: wine Branch: master Commit: 451f642e16cf5ffabae2579fa5c9b1b5fca80695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451f642e16cf5ffabae2579fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 00:28:38 2008 +0100 crypt32: Remove WINAPI on static functions where not needed. --- dlls/crypt32/decode.c | 4 ++-- dlls/crypt32/encode.c | 16 ++++++++-------- dlls/crypt32/regstore.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 84b08e7..a93f33d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -950,7 +950,7 @@ static BOOL CRYPT_AsnDecodeCertExtensions(const BYTE *pbEncoded, return ret; } -static BOOL WINAPI CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { @@ -1120,7 +1120,7 @@ static BOOL CRYPT_AsnDecodeCRLEntries(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } -static BOOL WINAPI CRYPT_AsnDecodeCRLInfo(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnDecodeCRLInfo(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 9e10298..08120ff 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -539,7 +539,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCertInfo(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeCRLEntry(const CRL_ENTRY *entry, +static BOOL CRYPT_AsnEncodeCRLEntry(const CRL_ENTRY *entry, BYTE *pbEncoded, DWORD *pcbEncoded) { struct AsnEncodeSequenceItem items[3] = { @@ -1078,7 +1078,7 @@ static BOOL WINAPI CRYPT_AsnEncodeNameValue(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeRdnAttr(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnEncodeRdnAttr(DWORD dwCertEncodingType, CERT_RDN_ATTR *attr, CryptEncodeObjectExFunc nameValueEncodeFunc, BYTE *pbEncoded, DWORD *pcbEncoded) { @@ -1271,7 +1271,7 @@ static BOOL WINAPI CRYPT_DEREncodeItemsAsSet(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, CERT_RDN *rdn, +static BOOL CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, CERT_RDN *rdn, CryptEncodeObjectExFunc nameValueEncodeFunc, BYTE *pbEncoded, DWORD *pcbEncoded) { @@ -1470,7 +1470,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCTLSubjectAlgorithm( return ret; } -static BOOL WINAPI CRYPT_AsnEncodeCTLEntry(const CTL_ENTRY *entry, +static BOOL CRYPT_AsnEncodeCTLEntry(const CTL_ENTRY *entry, BYTE *pbEncoded, DWORD *pcbEncoded) { struct AsnEncodeSequenceItem items[2] = { @@ -1604,7 +1604,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCTL(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeSMIMECapability(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnEncodeSMIMECapability(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { @@ -2658,7 +2658,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId2(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeAccessDescription( +static BOOL CRYPT_AsnEncodeAccessDescription( const CERT_ACCESS_DESCRIPTION *descr, BYTE *pbEncoded, DWORD *pcbEncoded) { struct AsnEncodeSequenceItem items[] = { @@ -3412,7 +3412,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUtcTime(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeGeneralizedTime(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnEncodeGeneralizedTime(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { @@ -3833,7 +3833,7 @@ static BOOL WINAPI CRYPT_AsnEncodeIssuingDistPoint(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeGeneralSubtree(DWORD dwCertEncodingType, +static BOOL CRYPT_AsnEncodeGeneralSubtree(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 5574a5e..7b9d67c 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -332,7 +332,7 @@ static void WINAPI CRYPT_RegCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) CryptMemFree(store); } -static BOOL WINAPI CRYPT_RegWriteContext(PWINE_REGSTOREINFO store, +static BOOL CRYPT_RegWriteContext(PWINE_REGSTOREINFO store, const void *context, DWORD dwFlags) { BOOL ret;

1 0

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

24 Nov '08

Module: wine Branch: master Commit: 7e4aa49387ff5fa0207c89eccf6c8310b917797e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4aa49387ff5fa0207c89ecc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 00:28:25 2008 +0100 comdlg32: Remove WINAPI on static functions where not needed. --- dlls/comdlg32/filedlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5aa2da5..953a5ba 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -240,7 +240,7 @@ static BOOL BrowseSelectedFolder(HWND hwnd); * OUT : TRUE on success * FALSE on cancel, error, close or filename-does-not-fit-in-buffer. */ -static BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos) +static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) { LRESULT lRes;

1 0