April 2011 - Wine-commits - list.winehq.org

Marcus Meissner : dinput: Mark internal symbols as hidden.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: cba138547a2fff801c7a2fc04061b62e281b4860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba138547a2fff801c7a2fc04… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 29 09:31:42 2011 +0200 dinput: Mark internal symbols as hidden. --- dlls/dinput/device_private.h | 148 +++++++++++++++++++++--------------------- 1 files changed, 74 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cba138547a2fff801c7a2…

1 0

Marcus Meissner : avifil32: Mark internal symbols as hidden.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 719345017c99e66558c729e3d3740883631d45f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719345017c99e66558c729e3d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 29 10:05:58 2011 +0200 avifil32: Mark internal symbols as hidden. --- dlls/avifil32/avifile_private.h | 18 +++++++++--------- dlls/avifil32/extrachunk.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index 85f1ca1..d35aa0f 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -57,16 +57,16 @@ DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0); DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0); -extern HMODULE AVIFILE_hModule; +extern HMODULE AVIFILE_hModule DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppobj); -extern HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppobj); -extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj); -extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj); -extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream); -extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream); -extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams); +extern HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) DECLSPEC_HIDDEN; +extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; +extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; -extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName); +extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; #endif diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h index 1eda7ef..843a73c 100644 --- a/dlls/avifil32/extrachunk.h +++ b/dlls/avifil32/extrachunk.h @@ -35,18 +35,18 @@ typedef struct _EXTRACHUNKS { } EXTRACHUNKS, *LPEXTRACHUNKS; /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size); +HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size) DECLSPEC_HIDDEN; /* writes a chunk into the extrachunk-structure */ -HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size); +HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size) DECLSPEC_HIDDEN; /* reads a chunk fomr the HMMIO into the extrachunk-structure */ -HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck); +HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck) DECLSPEC_HIDDEN; /* reads all non-junk chunks into the extrachunk-structure until it finds * the given chunk or the optional parent-chunk is at the end */ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio, - MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags); + MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags) DECLSPEC_HIDDEN; #ifdef __cplusplus }

1 0

Marcus Meissner : winhttp: Mark internal symbols as hidden.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 974326bfac982142914d5cfeb5cd4cbcb5a54c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=974326bfac982142914d5cfeb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 29 10:08:40 2011 +0200 winhttp: Mark internal symbols as hidden. --- dlls/winhttp/winhttp_private.h | 58 ++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 5da3ae1..2444052 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -204,38 +204,38 @@ typedef struct LPDWORD written; } write_data_t; -object_header_t *addref_object( object_header_t * ); -object_header_t *grab_object( HINTERNET ); -void release_object( object_header_t * ); -HINTERNET alloc_handle( object_header_t * ); -BOOL free_handle( HINTERNET ); - -void set_last_error( DWORD ); -DWORD get_last_error( void ); -void send_callback( object_header_t *, DWORD, LPVOID, DWORD ); -void close_connection( request_t * ); - -BOOL netconn_close( netconn_t * ); -BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ); -BOOL netconn_connected( netconn_t * ); -BOOL netconn_create( netconn_t *, int, int, int ); -BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ); -BOOL netconn_init( netconn_t *, BOOL ); -void netconn_unload( void ); -BOOL netconn_query_data_available( netconn_t *, DWORD * ); -BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); -BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ); -BOOL netconn_secure_connect( netconn_t *, WCHAR * ); -BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); -DWORD netconn_set_timeout( netconn_t *, BOOL, int ); -const void *netconn_get_certificate( netconn_t * ); -int netconn_get_cipher_strength( netconn_t * ); - -BOOL set_cookies( request_t *, const WCHAR * ); -BOOL add_cookie_headers( request_t * ); -BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ); -void delete_domain( domain_t * ); -BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ); +object_header_t *addref_object( object_header_t * ) DECLSPEC_HIDDEN; +object_header_t *grab_object( HINTERNET ) DECLSPEC_HIDDEN; +void release_object( object_header_t * ) DECLSPEC_HIDDEN; +HINTERNET alloc_handle( object_header_t * ) DECLSPEC_HIDDEN; +BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; + +void set_last_error( DWORD ) DECLSPEC_HIDDEN; +DWORD get_last_error( void ) DECLSPEC_HIDDEN; +void send_callback( object_header_t *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; +void close_connection( request_t * ) DECLSPEC_HIDDEN; + +BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; +BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) DECLSPEC_HIDDEN; +BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; +BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; +BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ) DECLSPEC_HIDDEN; +BOOL netconn_init( netconn_t *, BOOL ) DECLSPEC_HIDDEN; +void netconn_unload( void ) DECLSPEC_HIDDEN; +BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; +BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; +BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( netconn_t *, WCHAR * ) DECLSPEC_HIDDEN; +BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ) DECLSPEC_HIDDEN; +DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; +const void *netconn_get_certificate( netconn_t * ) DECLSPEC_HIDDEN; +int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN; + +BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; +BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; +BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; +void delete_domain( domain_t * ) DECLSPEC_HIDDEN; +BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) DECLSPEC_HIDDEN; static inline void *heap_alloc( SIZE_T size ) {

1 0

Marcus Meissner : wintrust: Mark internal symbols as hidden.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 4b0457427598659560ef287a45793f8de825161c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0457427598659560ef287a4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 29 10:10:10 2011 +0200 wintrust: Mark internal symbols as hidden. --- dlls/wintrust/wintrust_priv.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 148e161..66c925a 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -18,14 +18,14 @@ #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1); -void WINAPI WINTRUST_Free(void *p); -BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); +void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; +void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN; +BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, - BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); + BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, - BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add); + BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, - CRYPT_PROVIDER_PRIVDATA *pPrivData2Add); + CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) DECLSPEC_HIDDEN; #endif /* ndef __WINTRUST_PRIV_H__ */

1 0

Marcus Meissner : windowscodecs: Mark internal symbols as hidden.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 46f1d8a86518d0e8bc37e3b4da9438e0e5baad1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f1d8a86518d0e8bc37e3b4d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 29 10:11:52 2011 +0200 windowscodecs: Mark internal symbols as hidden. --- dlls/windowscodecs/ungif.c | 3 +- dlls/windowscodecs/ungif.h | 6 ++-- dlls/windowscodecs/wincodecs_private.h | 50 ++++++++++++++++---------------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 87a9331..85cd924 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -49,12 +49,13 @@ #include <stdlib.h> #include <string.h> -#include "ungif.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "ungif.h" + static void *ungif_alloc( size_t sz ) { return HeapAlloc( GetProcessHeap(), 0, sz ); diff --git a/dlls/windowscodecs/ungif.h b/dlls/windowscodecs/ungif.h index 5e39c56..510b69a 100644 --- a/dlls/windowscodecs/ungif.h +++ b/dlls/windowscodecs/ungif.h @@ -129,9 +129,9 @@ typedef int (*InputFunc) (GifFileType *, GifByteType *, int); #define APPLICATION_EXT_FUNC_CODE 0xff /* application block */ /* public interface to ungif.c */ -int DGifSlurp(GifFileType * GifFile); -GifFileType *DGifOpen(void *userPtr, InputFunc readFunc); -int DGifCloseFile(GifFileType * GifFile); +int DGifSlurp(GifFileType * GifFile) DECLSPEC_HIDDEN; +GifFileType *DGifOpen(void *userPtr, InputFunc readFunc) DECLSPEC_HIDDEN; +int DGifCloseFile(GifFileType * GifFile) DECLSPEC_HIDDEN; #define D_GIF_ERR_OPEN_FAILED 101 /* And DGif possible errors. */ #define D_GIF_ERR_READ_FAILED 102 diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 1614753..70abaf9 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -27,41 +27,41 @@ DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47 DEFINE_GUID(GUID_VendorWine, 0xddf46da1,0x7dc1,0x404e,0x98,0xf2,0xef,0xa4,0x8d,0xfc,0x95,0x0a); -extern HRESULT FormatConverter_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); -extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); -extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); -extern HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); -extern HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); -extern HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); -extern HRESULT DibDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); -extern HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); -extern HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); -extern HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); -extern HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); -extern HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); -extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); +extern HRESULT FormatConverter_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT DibDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; -extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); +extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; -extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator); -extern HRESULT PaletteImpl_Create(IWICPalette **palette); -extern HRESULT StreamImpl_Create(IWICStream **stream); +extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) DECLSPEC_HIDDEN; +extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN; +extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN; extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, - const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer); + const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) DECLSPEC_HIDDEN; -extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride); +extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) DECLSPEC_HIDDEN; -extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2); +extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) DECLSPEC_HIDDEN; -extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo); -extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown); +extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN; +extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) DECLSPEC_HIDDEN; typedef struct BmpDecoder BmpDecoder; -extern HRESULT IcoDibDecoder_CreateInstance(BmpDecoder **ppDecoder); -extern void BmpDecoder_GetWICDecoder(BmpDecoder *This, IWICBitmapDecoder **ppDecoder); -extern void BmpDecoder_FindIconMask(BmpDecoder *This, ULONG *mask_offset, int *topdown); +extern HRESULT IcoDibDecoder_CreateInstance(BmpDecoder **ppDecoder) DECLSPEC_HIDDEN; +extern void BmpDecoder_GetWICDecoder(BmpDecoder *This, IWICBitmapDecoder **ppDecoder) DECLSPEC_HIDDEN; +extern void BmpDecoder_FindIconMask(BmpDecoder *This, ULONG *mask_offset, int *topdown) DECLSPEC_HIDDEN; #endif /* WINCODECS_PRIVATE_H */

1 0

Piotr Caban : msvcp90: Move basic_string<char>:swap implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: b7990be894ecac8106edeb737782f5a8eade767a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7990be894ecac8106edeb737… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:14:41 2011 +0200 msvcp90: Move basic_string<char>:swap implementation. --- dlls/msvcp90/string.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index b604092..761e612 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -780,6 +780,28 @@ size_t __thiscall MSVCP_basic_string_char_length(basic_string_char *this) return this->size; } +/* ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_swap, 8) +void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_string_char *str) +{ + if(this != str) { + char tmp[sizeof(this->data)]; + const size_t size = this->size; + const size_t res = this->res; + + memcpy(tmp, this->data.buf, sizeof(this->data)); + memcpy(this->data.buf, str->data.buf, sizeof(this->data)); + memcpy(str->data.buf, tmp, sizeof(this->data)); + + this->size = str->size; + this->res = str->res; + + str->size = size; + str->res = res; + } +} + /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@II(a)Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_substr, 16) @@ -1262,28 +1284,6 @@ size_t __thiscall MSVCP_basic_string_wchar_length(basic_string_wchar *this) return this->size; } -/* ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z */ -/* ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_swap, 8) -void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_string_char *str) -{ - if(this != str) { - char tmp[sizeof(this->data)]; - const size_t size = this->size; - const size_t res = this->res; - - memcpy(tmp, this->data.buf, sizeof(this->data)); - memcpy(this->data.buf, str->data.buf, sizeof(this->data)); - memcpy(str->data.buf, tmp, sizeof(this->data)); - - this->size = str->size; - this->res = str->res; - - str->size = size; - str->res = res; - } -} - /* ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z */ /* ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_swap, 8)

1 0

Alexandre Julliard : wineps: Add a helper function for paper size conversions.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: ca3b82022762ff205ca82713eab39f3f7a541057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3b82022762ff205ca82713e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 28 20:59:27 2011 +0200 wineps: Add a helper function for paper size conversions. --- dlls/wineps.drv/driver.c | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 7b30f3f..ec16488 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -39,6 +39,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +/* convert points to paper size units (10th of a millimeter) */ +static inline int paper_size_from_points( float size ) +{ + return size * 254 / 72; +} /************************************************************************ * @@ -72,10 +77,8 @@ void PSDRV_MergeDevmodes(PSDRV_DEVMODEA *dm1, PSDRV_DEVMODEA *dm2, } if(&page->entry != &pi->ppd->PageSizes ) { dm1->dmPublic.u1.s1.dmPaperSize = dm2->dmPublic.u1.s1.dmPaperSize; - dm1->dmPublic.u1.s1.dmPaperWidth = page->PaperDimension->x * - 254.0 / 72.0; - dm1->dmPublic.u1.s1.dmPaperLength = page->PaperDimension->y * - 254.0 / 72.0; + dm1->dmPublic.u1.s1.dmPaperWidth = paper_size_from_points( page->PaperDimension->x ); + dm1->dmPublic.u1.s1.dmPaperLength = paper_size_from_points( page->PaperDimension->y ); dm1->dmPublic.dmFields &= ~(DM_PAPERLENGTH | DM_PAPERWIDTH); dm1->dmPublic.dmFields |= DM_PAPERSIZE; TRACE("Changing page to %s %d x %d\n", page->FullName, @@ -458,8 +461,8 @@ DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR TRACE("DC_PAPERSIZE: %f x %f\n", ps->PaperDimension->x, ps->PaperDimension->y); i++; if(lpszOutput != NULL) { - pt->x = ps->PaperDimension->x * 254.0 / 72.0; - pt->y = ps->PaperDimension->y * 254.0 / 72.0; + pt->x = paper_size_from_points( ps->PaperDimension->x ); + pt->y = paper_size_from_points( ps->PaperDimension->y ); pt++; } } @@ -564,33 +567,27 @@ DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR case DC_MAXEXTENT: { PAGESIZE *ps; - POINT ptMax; - ptMax.x = ptMax.y = 0; + float x = 0, y = 0; LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { - if(ps->PaperDimension->x > ptMax.x) - ptMax.x = ps->PaperDimension->x; - if(ps->PaperDimension->y > ptMax.y) - ptMax.y = ps->PaperDimension->y; + if (ps->PaperDimension->x > x) x = ps->PaperDimension->x; + if (ps->PaperDimension->y > y) y = ps->PaperDimension->y; } - return MAKELONG(ptMax.x * 254.0 / 72.0, ptMax.y * 254.0 / 72.0 ); + return MAKELONG( paper_size_from_points(x), paper_size_from_points(y) ); } case DC_MINEXTENT: { PAGESIZE *ps; - POINT ptMin; - ptMin.x = ptMin.y = -1; + float x = 1e6, y = 1e6; LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { - if(ptMin.x == -1 || ps->PaperDimension->x < ptMin.x) - ptMin.x = ps->PaperDimension->x; - if(ptMin.y == -1 || ps->PaperDimension->y < ptMin.y) - ptMin.y = ps->PaperDimension->y; + if (ps->PaperDimension->x < x) x = ps->PaperDimension->x; + if (ps->PaperDimension->y < y) y = ps->PaperDimension->y; } - return MAKELONG(ptMin.x * 254.0 / 72.0, ptMin.y * 254.0 / 72.0); + return MAKELONG( paper_size_from_points(x), paper_size_from_points(y) ); } case DC_SIZE:

1 0

André Hentschel : shell32: Don' t crash if selection is NULL.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: e556b45f4380ffeb6d87a215085285ca1feaf2d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e556b45f4380ffeb6d87a2150… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 28 22:31:31 2011 +0200 shell32: Don't crash if selection is NULL. --- dlls/shell32/brsfolder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 9b0d20b..3824c4e 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -782,6 +782,8 @@ static BOOL BrsFolder_OnSetSelectionW(browse_info *info, LPVOID selection, BOOL HTREEITEM hItem; BOOL bResult; + if (!selection) return FALSE; + bResult = BrsFolder_OnSetExpanded(info, selection, is_str, &hItem); if (bResult) SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hItem );

1 0

André Hentschel : shell32: Add some selection tests.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: e7cc2f76daac482a492e5703ba2bb963c4ed3b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cc2f76daac482a492e5703b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 28 22:32:52 2011 +0200 shell32: Add some selection tests. --- dlls/shell32/tests/brsfolder.c | 93 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index fd547cb..7adaa1f 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -2,6 +2,7 @@ * Unit test of the SHBrowseForFolder function. * * Copyright 2009-2010 Michael Mc Donnell + * Copyright 2011 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,6 +28,7 @@ #define TIMER_WAIT_MS 50 /* Should be long enough for slow systems */ static const char new_folder_name[] = "foo"; +static LPITEMIDLIST selected_folder_pidl; /* * Returns the number of folders in a folder. @@ -247,7 +249,98 @@ static void test_click_make_new_folder_button(void) CoUninitialize(); } + +/* + * Callback used by test_selection. + */ +static int CALLBACK selection_callback(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) +{ + DWORD ret; + + switch (uMsg) + { + case BFFM_INITIALIZED: + /* test with zero values */ + ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 0, 0); + ok(!ret, "SendMessage returned: %u\n", ret); + ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 0, 0); + ok(!ret, "SendMessage returned: %u\n", ret); + + ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 1, 0); + ok(!ret, "SendMessage returned: %u\n", ret); + + if(0) + { + /* Crashes on NT4 */ + ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 1, 0); + ok(!ret, "SendMessage returned: %u\n", ret); + } + + ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 0, (LPARAM)selected_folder_pidl); + ok(!ret, "SendMessage returned: %u\n", ret); + ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 0, (LPARAM)selected_folder_pidl); + ok(!ret, "SendMessage returned: %u\n", ret); + + ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 1, (LPARAM)selected_folder_pidl); + ok(!ret, "SendMessage returned: %u\n", ret); + ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 1, (LPARAM)selected_folder_pidl); + ok(!ret, "SendMessage returned: %u\n", ret); + + ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 1, (LPARAM)new_folder_name); + ok(!ret, "SendMessage returned: %u\n", ret); + ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 1, (LPARAM)new_folder_name); + ok(!ret, "SendMessage returned: %u\n", ret); + + SendMessage(hwnd, WM_COMMAND, IDOK, 0); + return TRUE; + default: + return FALSE; + } +} + +static void test_selection(void) +{ + HRESULT resCoInit; + BROWSEINFO bi; + LPITEMIDLIST pidl = NULL; + IShellFolder *desktop_object; + WCHAR selected_folderW[MAX_PATH]; + const CHAR title[] = "test_selection"; + + resCoInit = CoInitialize(NULL); + if(!(resCoInit == S_OK || resCoInit == S_FALSE)) + { + skip("COM could not be initialized %u\n", GetLastError()); + return; + } + + if (!GetCurrentDirectoryW(MAX_PATH, selected_folderW)) + { + skip("GetCurrentDirectoryW failed %u\n", GetLastError()); + } + + /* Initialize browse info struct for SHBrowseForFolder */ + bi.hwndOwner = NULL; + bi.pszDisplayName = NULL; + bi.lpszTitle = (LPTSTR) title; + bi.ulFlags = BIF_NEWDIALOGSTYLE; + bi.lpfn = selection_callback; + + SHGetDesktopFolder(&desktop_object); + desktop_object->lpVtbl->ParseDisplayName(desktop_object, NULL, NULL, + selected_folderW, 0UL, &selected_folder_pidl, 0UL); + bi.pidlRoot = selected_folder_pidl; + + pidl = SHBrowseForFolder(&bi); + + if (pidl) + CoTaskMemFree(pidl); + + CoUninitialize(); +} + START_TEST(brsfolder) { test_click_make_new_folder_button(); + test_selection(); }

1 0

Jacek Caban : wininet: Rename WININET_NETCONNECTION to netconn_t.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 12bf3472dd56876fe3ad822e6b13b94dd48ba276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bf3472dd56876fe3ad822e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 28 18:29:04 2011 +0200 wininet: Rename WININET_NETCONNECTION to netconn_t. --- dlls/wininet/internet.h | 28 ++++++++++++++-------------- dlls/wininet/netconnection.c | 26 +++++++++++++------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c760e83..1ef0dd6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -56,7 +56,7 @@ typedef struct int socketFD; void *ssl_s; DWORD security_flags; -} WININET_NETCONNECTION; +} netconn_t; static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { @@ -279,7 +279,7 @@ typedef struct LPWSTR path; LPWSTR verb; LPWSTR rawHeaders; - WININET_NETCONNECTION netConnection; + netconn_t netConnection; LPWSTR version; LPWSTR statusText; DWORD bytesToWrite; @@ -487,23 +487,23 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) DECLSPEC_HIDDEN; -BOOL NETCON_connected(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; -DWORD NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL) DECLSPEC_HIDDEN; +BOOL NETCON_connected(netconn_t *connection) DECLSPEC_HIDDEN; +DWORD NETCON_init(netconn_t *connnection, BOOL useSSL) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; -DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, +DWORD NETCON_create(netconn_t *connection, int domain, int type, int protocol) DECLSPEC_HIDDEN; -DWORD NETCON_close(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; -DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, +DWORD NETCON_close(netconn_t *connection) DECLSPEC_HIDDEN; +DWORD NETCON_connect(netconn_t *connection, const struct sockaddr *serv_addr, unsigned int addrlen) DECLSPEC_HIDDEN; -DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) DECLSPEC_HIDDEN; -DWORD NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags, +DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) DECLSPEC_HIDDEN; +DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; -DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int *recvd /* out */) DECLSPEC_HIDDEN; -BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available) DECLSPEC_HIDDEN; -LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; -int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; -DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) DECLSPEC_HIDDEN; +BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) DECLSPEC_HIDDEN; +LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; +int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; +DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, int value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; extern void URLCacheContainers_CreateDefaults(void) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index add3b49..e295b6c 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -318,7 +318,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) BOOL ret = FALSE; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - WININET_NETCONNECTION *conn; + netconn_t *conn; ssl = pX509_STORE_CTX_get_ex_data(ctx, pSSL_get_ex_data_X509_STORE_CTX_idx()); @@ -368,7 +368,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) #endif -DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) +DWORD NETCON_init(netconn_t *connection, BOOL useSSL) { connection->useSSL = useSSL; connection->socketFD = -1; @@ -545,7 +545,7 @@ void NETCON_unload(void) #endif } -BOOL NETCON_connected(WININET_NETCONNECTION *connection) +BOOL NETCON_connected(netconn_t *connection) { return connection->socketFD != -1; } @@ -621,7 +621,7 @@ int sock_get_error( int err ) * NETCON_create * Basically calls 'socket()' */ -DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, +DWORD NETCON_create(netconn_t *connection, int domain, int type, int protocol) { #ifdef SONAME_LIBSSL @@ -640,7 +640,7 @@ DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, * NETCON_close * Basically calls 'close()' unless we should use SSL */ -DWORD NETCON_close(WININET_NETCONNECTION *connection) +DWORD NETCON_close(netconn_t *connection) { int result; @@ -667,7 +667,7 @@ DWORD NETCON_close(WININET_NETCONNECTION *connection) * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. */ -DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) +DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) { void *ssl_s; DWORD res = ERROR_NOT_SUPPORTED; @@ -736,7 +736,7 @@ fail: * NETCON_connect * Connects to the specified address. */ -DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, +DWORD NETCON_connect(netconn_t *connection, const struct sockaddr *serv_addr, unsigned int addrlen) { int result; @@ -759,7 +759,7 @@ DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *s * Basically calls 'send()' unless we should use SSL * number of chars send is put in *sent */ -DWORD NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags, +DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) { if (!NETCON_connected(connection)) return ERROR_INTERNET_CONNECTION_ABORTED; @@ -794,7 +794,7 @@ DWORD NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len * Basically calls 'recv()' unless we should use SSL * number of chars received is put in *recvd */ -DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int *recvd /* out */) { *recvd = 0; @@ -836,7 +836,7 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int * Returns the number of bytes of peeked data plus the number of bytes of * queued, but unread data. */ -BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available) +BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { *available = 0; if (!NETCON_connected(connection)) @@ -863,7 +863,7 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail return TRUE; } -LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) +LPCVOID NETCON_GetCert(netconn_t *connection) { #ifdef SONAME_LIBSSL X509* cert; @@ -880,7 +880,7 @@ LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) #endif } -int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) +int NETCON_GetCipherStrength(netconn_t *connection) { #ifdef SONAME_LIBSSL #if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) @@ -902,7 +902,7 @@ int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) #endif } -DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) +DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, int value) { int result; struct timeval tv;

1 0