wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Nicolas Le Cam : comctl32/tests: Remove a set but unused variable.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 401961f8fb69859f03a38ed40aa47c3d0fe93cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=401961f8fb69859f03a38ed40… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 30 00:46:30 2011 +0200 comctl32/tests: Remove a set but unused variable. --- dlls/comctl32/tests/listview.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c2bf70b..35c7734 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3023,7 +3023,7 @@ static void test_hittest(void) static CHAR text[] = "1234567890ABCDEFGHIJKLMNOPQRST"; POINT pos; INT x, y, i; - WORD horiz, vert; + WORD vert; HIMAGELIST himl, himl2; HBITMAP hbmp; @@ -3053,7 +3053,6 @@ static void test_hittest(void) ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); ok(bounds.right - bounds.left > 0, "Expected non zero item width\n"); r = SendMessage(hwnd, LVM_GETITEMSPACING, TRUE, 0); - horiz = LOWORD(r); vert = HIWORD(r); ok(bounds.bottom - bounds.top == vert, "Vertical spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert);

1 0

Marcus Meissner : amstream: Mark internal symbols as hidden.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 5c29f78e6c49434af7f117ae658e876942bcbf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c29f78e6c49434af7f117ae6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 20:44:46 2011 +0200 amstream: Mark internal symbols as hidden. --- dlls/amstream/amstream_private.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index b10b632..3466f9e 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -34,9 +34,9 @@ #include "dshow.h" #include "mmstream.h" -HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj); -HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj); -HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream); -HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream); +HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) DECLSPEC_HIDDEN; +HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */

1 0

Marcus Meissner : browseui: Mark internal symbols as hidden.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: cc43dba68ecb293143fc57dd06815b8e294cfe67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc43dba68ecb293143fc57dd0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 20:41:45 2011 +0200 browseui: Mark internal symbols as hidden. --- dlls/browseui/browseui.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 923aadb..e03f47f 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -21,13 +21,13 @@ #ifndef __WINE_BROWSEUI_H #define __WINE_BROWSEUI_H -extern LONG BROWSEUI_refCount; -extern HINSTANCE BROWSEUI_hinstance; +extern LONG BROWSEUI_refCount DECLSPEC_HIDDEN; +extern HINSTANCE BROWSEUI_hinstance DECLSPEC_HIDDEN; -extern HRESULT ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); -extern HRESULT ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut); -extern HRESULT CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut); -extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +extern HRESULT ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; extern const GUID CLSID_CompCatCacheDaemon;

1 0

Marcus Meissner : advpack: Mark internal symbols as hidden.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 048999c79a95ea8adbd23685beb0f1a6694200d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048999c79a95ea8adbd23685b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 20:40:11 2011 +0200 advpack: Mark internal symbols as hidden. --- dlls/advpack/advpack_private.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 3f81bba..23babf6 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,10 +21,10 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg); -LPWSTR get_parameter(LPWSTR *params, WCHAR separator); -void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir); +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) DECLSPEC_HIDDEN; +LPWSTR get_parameter(LPWSTR *params, WCHAR separator) DECLSPEC_HIDDEN; +void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; -HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE); +HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; #endif /* __ADVPACK_PRIVATE_H */

1 0

Marcus Meissner : mshtml: Mark internal symbols as hidden.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 8b500948fa7d29b41779a53b29fb81d2ef28b85c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b500948fa7d29b41779a53b2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 20:27:06 2011 +0200 mshtml: Mark internal symbols as hidden. --- dlls/mshtml/htmlevent.h | 22 +- dlls/mshtml/htmlstyle.h | 12 +- dlls/mshtml/mshtml_private.h | 416 +++++++++++++++++++++--------------------- dlls/mshtml/pluginhost.h | 20 +- dlls/mshtml/secmgr.c | 2 +- 5 files changed, 236 insertions(+), 236 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b500948fa7d29b41779a…

1 0

Marcus Meissner : winex11.drv: Assertion was 1 off (Coverity).
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: ea85bc950999d303bdc0a0706787e9a6d5003025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea85bc950999d303bdc0a0706… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 14:51:29 2011 +0200 winex11.drv: Assertion was 1 off (Coverity). --- dlls/winex11.drv/event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index acaf49c..3af56f8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -190,7 +190,7 @@ static inline void free_event_data( XEvent *event ) */ void X11DRV_register_event_handler( int type, x11drv_event_handler handler, const char *name ) { - assert( type <= MAX_EVENT_HANDLERS ); + assert( type < MAX_EVENT_HANDLERS ); assert( !handlers[type] || handlers[type] == handler ); handlers[type] = handler; event_names[type] = name;

1 0

Marcus Meissner : mscms: Mark internal symbols as hidden.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: bb8466eb003ef7983b8971541e9db0b1e74dcdf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8466eb003ef7983b8971541… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 10:07:20 2011 +0200 mscms: Mark internal symbols as hidden. --- dlls/mscms/mscms_priv.h | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index e48193e..ffaf13b 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -87,28 +87,28 @@ struct transform cmsHTRANSFORM cmstransform; }; -extern HPROFILE create_profile( struct profile * ); -extern BOOL close_profile( HPROFILE ); +extern HPROFILE create_profile( struct profile * ) DECLSPEC_HIDDEN; +extern BOOL close_profile( HPROFILE ) DECLSPEC_HIDDEN; -extern HTRANSFORM create_transform( struct transform * ); -extern BOOL close_transform( HTRANSFORM ); +extern HTRANSFORM create_transform( struct transform * ) DECLSPEC_HIDDEN; +extern BOOL close_transform( HTRANSFORM ) DECLSPEC_HIDDEN; -struct profile *grab_profile( HPROFILE ); -struct transform *grab_transform( HTRANSFORM ); +struct profile *grab_profile( HPROFILE ) DECLSPEC_HIDDEN; +struct transform *grab_transform( HTRANSFORM ) DECLSPEC_HIDDEN; -void release_profile( struct profile * ); -void release_transform( struct transform * ); +void release_profile( struct profile * ) DECLSPEC_HIDDEN; +void release_transform( struct transform * ) DECLSPEC_HIDDEN; -extern void free_handle_tables( void ); +extern void free_handle_tables( void ) DECLSPEC_HIDDEN; -extern DWORD MSCMS_get_tag_count( const icProfile *iccprofile ); -extern void MSCMS_get_tag_by_index( icProfile *iccprofile, DWORD index, icTag *tag ); -extern void MSCMS_get_tag_data( const icProfile *iccprofile, const icTag *tag, DWORD offset, void *buffer ); -extern void MSCMS_set_tag_data( icProfile *iccprofile, const icTag *tag, DWORD offset, const void *buffer ); -extern void MSCMS_get_profile_header( const icProfile *iccprofile, PROFILEHEADER *header ); -extern void MSCMS_set_profile_header( icProfile *iccprofile, const PROFILEHEADER *header ); -extern DWORD MSCMS_get_profile_size( const icProfile *iccprofile ); +extern DWORD MSCMS_get_tag_count( const icProfile *iccprofile ) DECLSPEC_HIDDEN; +extern void MSCMS_get_tag_by_index( icProfile *iccprofile, DWORD index, icTag *tag ) DECLSPEC_HIDDEN; +extern void MSCMS_get_tag_data( const icProfile *iccprofile, const icTag *tag, DWORD offset, void *buffer ) DECLSPEC_HIDDEN; +extern void MSCMS_set_tag_data( icProfile *iccprofile, const icTag *tag, DWORD offset, const void *buffer ) DECLSPEC_HIDDEN; +extern void MSCMS_get_profile_header( const icProfile *iccprofile, PROFILEHEADER *header ) DECLSPEC_HIDDEN; +extern void MSCMS_set_profile_header( icProfile *iccprofile, const PROFILEHEADER *header ) DECLSPEC_HIDDEN; +extern DWORD MSCMS_get_profile_size( const icProfile *iccprofile ) DECLSPEC_HIDDEN; #endif /* HAVE_LCMS */ -extern const char *MSCMS_dbgstr_tag(DWORD); +extern const char *MSCMS_dbgstr_tag(DWORD) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : ddraw: Added missing break (Coverity).
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 6d144cf0121320b76e5d7b697a162192c7274c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d144cf0121320b76e5d7b697… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 15:37:51 2011 +0200 ddraw: Added missing break (Coverity). --- dlls/ddraw/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3909987..001dff3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2384,6 +2384,7 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, WINED3DRS_DEPTHBIAS, &wined3d_value.d); if (SUCCEEDED(hr)) *Value = -wined3d_value.f * 16.0f; + break; } default:

1 0

Eric Pouech : dbghelp: Enhance a couple of register mapping functions for i386.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 108b63f5a61c91df6fefeef1c5a097df4a0d1837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108b63f5a61c91df6fefeef1c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 1 09:46:30 2011 +0200 dbghelp: Enhance a couple of register mapping functions for i386. --- dlls/dbghelp/cpu_i386.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 73cbe1a..8fe5eac 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -541,11 +541,11 @@ static unsigned i386_map_dwarf_register(unsigned regno) case 24: reg = CV_REG_CTRL; break; case 25: reg = CV_REG_STAT; break; case 26: reg = CV_REG_TAG; break; + case 27: reg = CV_REG_FPCS; break; + case 28: reg = CV_REG_FPIP; break; + case 29: reg = CV_REG_FPDS; break; + case 30: reg = CV_REG_FPDO; break; /* -reg: fiseg 27 -reg: fioff 28 -reg: foseg 29 -reg: fooff 30 reg: fop 31 */ case 32: case 33: case 34: case 35: @@ -583,6 +583,14 @@ static void* i386_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size case CV_REG_ST0 + 6: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[6*sizeof(long double)]; case CV_REG_ST0 + 7: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[7*sizeof(long double)]; + case CV_REG_CTRL: *size = sizeof(DWORD); return &ctx->FloatSave.ControlWord; + case CV_REG_STAT: *size = sizeof(DWORD); return &ctx->FloatSave.StatusWord; + case CV_REG_TAG: *size = sizeof(DWORD); return &ctx->FloatSave.TagWord; + case CV_REG_FPCS: *size = sizeof(DWORD); return &ctx->FloatSave.ErrorSelector; + case CV_REG_FPIP: *size = sizeof(DWORD); return &ctx->FloatSave.ErrorOffset; + case CV_REG_FPDS: *size = sizeof(DWORD); return &ctx->FloatSave.DataSelector; + case CV_REG_FPDO: *size = sizeof(DWORD); return &ctx->FloatSave.DataOffset; + case CV_REG_EFLAGS: *size = sizeof(ctx->EFlags); return &ctx->EFlags; case CV_REG_ES: *size = sizeof(ctx->SegEs); return &ctx->SegEs; case CV_REG_CS: *size = sizeof(ctx->SegCs); return &ctx->SegCs; @@ -627,6 +635,25 @@ static const char* i386_fetch_regname(unsigned regno) case CV_REG_DS: return "ds"; case CV_REG_FS: return "fs"; case CV_REG_GS: return "gs"; + + case CV_REG_CTRL: return "fpControl"; + case CV_REG_STAT: return "fpStatus"; + case CV_REG_TAG: return "fpTag"; + case CV_REG_FPCS: return "fpCS"; + case CV_REG_FPIP: return "fpIP"; + case CV_REG_FPDS: return "fpDS"; + case CV_REG_FPDO: return "fpData"; + + case CV_REG_XMM0 + 0: return "xmm0"; + case CV_REG_XMM0 + 1: return "xmm1"; + case CV_REG_XMM0 + 2: return "xmm2"; + case CV_REG_XMM0 + 3: return "xmm3"; + case CV_REG_XMM0 + 4: return "xmm4"; + case CV_REG_XMM0 + 5: return "xmm5"; + case CV_REG_XMM0 + 6: return "xmm6"; + case CV_REG_XMM0 + 7: return "xmm7"; + + case CV_REG_MXCSR: return "MxCSR"; } FIXME("Unknown register %x\n", regno); return NULL;

1 0

Eric Pouech : dbghelp: Don' t try to load fieldlist for a forward declaration.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 2c2da87ccdd395cf78c0773122c2b9c5c8b0914a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2da87ccdd395cf78c077312… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 1 09:46:29 2011 +0200 dbghelp: Don't try to load fieldlist for a forward declaration. --- dlls/dbghelp/msc.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index cab3338..451018b 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1156,8 +1156,9 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, if (details) { codeview_add_type(curr_type, symt); - codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, - type->struct_v1.fieldlist); + if (!(type->struct_v1.property & 0x80)) /* 0x80 = forward declaration */ + codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, + type->struct_v1.fieldlist); } break; @@ -1171,8 +1172,9 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, if (details) { codeview_add_type(curr_type, symt); - codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, - type->struct_v2.fieldlist); + if (!(type->struct_v2.property & 0x80)) /* 0x80 = forward declaration */ + codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, + type->struct_v2.fieldlist); } break; @@ -1186,8 +1188,9 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, if (details) { codeview_add_type(curr_type, symt); - codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, - type->struct_v3.fieldlist); + if (!(type->struct_v3.property & 0x80)) /* 0x80 = forward declaration */ + codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, + type->struct_v3.fieldlist); } break;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011