November 2011 - Wine-commits

Andrew Talbot : cryptui: Remove unneeded address-of operators from array names.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: c61958ec783ec6079ccfa42a712988722b30b156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61958ec783ec6079ccfa42a7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 31 21:19:21 2011 +0000 cryptui: Remove unneeded address-of operators from array names. --- dlls/cryptui/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 5f742d6..5c8fd27 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5471,7 +5471,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, data.autoDest = TRUE; data.success = TRUE; - memset(&pages, 0, sizeof(pages)); + memset(pages, 0, sizeof(pages)); pages[nPages].dwSize = sizeof(pages[0]); pages[nPages].hInstance = hInstance; @@ -6884,7 +6884,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.file = INVALID_HANDLE_VALUE; data.success = FALSE; - memset(&pages, 0, sizeof(pages)); + memset(pages, 0, sizeof(pages)); pages[nPages].dwSize = sizeof(pages[0]); pages[nPages].hInstance = hInstance;

1 0

Andrew Talbot : fusion: Remove unneeded address-of operators from array names.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: d2752363209555a28bc8d8f4818da64fdfc3cbd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2752363209555a28bc8d8f48… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 31 21:19:25 2011 +0000 fusion: Remove unneeded address-of operators from array names. --- dlls/fusion/asmenum.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 99462ed..52229a8 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -236,9 +236,9 @@ static int compare_assembly_names(ASMNAME *asmname1, ASMNAME *asmname2) DWORD size, i; size = sizeof(name1); - IAssemblyName_GetProperty(asmname1->name, ASM_NAME_NAME, &name1, &size); + IAssemblyName_GetProperty(asmname1->name, ASM_NAME_NAME, name1, &size); size = sizeof(name2); - IAssemblyName_GetProperty(asmname2->name, ASM_NAME_NAME, &name2, &size); + IAssemblyName_GetProperty(asmname2->name, ASM_NAME_NAME, name2, &size); if ((ret = strcmpiW(name1, name2))) return ret;

1 0

Andrew Talbot : gdiplus: Remove unneeded address-of operators from array names.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 51804165aad384c0cc960e68ce01002a4ed5453c URL: http://source.winehq.org/git/wine.git/?a=commit;h=51804165aad384c0cc960e68c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 31 21:19:29 2011 +0000 gdiplus: Remove unneeded address-of operators from array names. --- dlls/gdiplus/region.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 0afbdbd..485c3a3 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1420,7 +1420,7 @@ static GpStatus get_region_scans_data(GpRegion *region, GpMatrix *matrix, LPRGND (*data)->rdh.rcBound.left = (*data)->rdh.rcBound.top = -0x400000; (*data)->rdh.rcBound.right = (*data)->rdh.rcBound.bottom = 0x400000; - memcpy(&(*data)->Buffer, &(*data)->rdh.rcBound, sizeof(RECT)); + memcpy((*data)->Buffer, &(*data)->rdh.rcBound, sizeof(RECT)); } else stat = OutOfMemory; @@ -1469,7 +1469,7 @@ GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *region, GpRect *scans, INT *co if (stat == Ok) { *count = data->rdh.nCount; - rects = (RECT*)&data->Buffer; + rects = (RECT*)data->Buffer; if (scans) { @@ -1503,7 +1503,7 @@ GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *region, GpRectF *scans, INT *co if (stat == Ok) { *count = data->rdh.nCount; - rects = (RECT*)&data->Buffer; + rects = (RECT*)data->Buffer; if (scans) {

1 0

Andrew Talbot : ole32: Remove unneeded address-of operators from array names.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 85fc5a3ae910f371f025a5bd2ce482840f62152d URL: http://source.winehq.org/git/wine.git/?a=commit;h=85fc5a3ae910f371f025a5bd2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 31 21:19:33 2011 +0000 ole32: Remove unneeded address-of operators from array names. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 69a00cd..f279ee5 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1302,7 +1302,7 @@ static HRESULT StorageImpl_CreateDirEntry( * memset the empty entry in order to initialize the unused newly * created entries */ - memset(&emptyData, 0, RAW_DIRENTRY_SIZE); + memset(emptyData, 0, RAW_DIRENTRY_SIZE); /* * initialize them @@ -1347,7 +1347,7 @@ static HRESULT StorageImpl_DestroyDirEntry( BYTE emptyData[RAW_DIRENTRY_SIZE]; StorageImpl *storage = (StorageImpl*)base; - memset(&emptyData, 0, RAW_DIRENTRY_SIZE); + memset(emptyData, 0, RAW_DIRENTRY_SIZE); hr = StorageImpl_WriteRawDirEntry(storage, index, emptyData);

1 0

Andrew Talbot : qedit: Remove unneeded address-of operator from array name.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 710483eb2aad77839ed8da87008e3b5fb9872c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710483eb2aad77839ed8da870… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 31 21:19:37 2011 +0000 qedit: Remove unneeded address-of operator from array name. --- dlls/qedit/samplegrabber.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 19556cf..c22c6ce 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -88,7 +88,7 @@ Fixed_IEnumPins_QueryInterface(IEnumPins *iface, REFIID riid, void **ppvObject) if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumPins)) { Fixed_IEnumPins_AddRef(iface); - *ppvObject = &(This->pins); + *ppvObject = This->pins; return S_OK; } *ppvObject = NULL;

1 0

Nikolay Sivov : msxml3: Fix trace formats to match all other files.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 32d217d2e3d9f5da79d8456d474e536ba38752b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d217d2e3d9f5da79d8456d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 31 16:44:28 2011 +0300 msxml3: Fix trace formats to match all other files. --- dlls/msxml3/parseerror.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 3f5c59f..8e67816 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -60,7 +60,9 @@ static HRESULT WINAPI parseError_QueryInterface( REFIID riid, void** ppvObject ) { - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); + parse_error_t *This = impl_from_IXMLDOMParseError( iface ); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -85,7 +87,7 @@ static ULONG WINAPI parseError_AddRef( { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE("(%p) ref now %d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); return ref; } @@ -93,10 +95,9 @@ static ULONG WINAPI parseError_Release( IXMLDOMParseError *iface ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); - TRACE("(%p) ref now %d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { SysFreeString(This->url);

1 0

Nikolay Sivov : msxml3: Init IDispatchEx data for all node types.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 8bd54c56e7c556e62cb96c9f8aca863ea6501cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd54c56e7c556e62cb96c9f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 31 22:09:12 2011 +0300 msxml3: Init IDispatchEx data for all node types. --- dlls/msxml3/attribute.c | 14 ++++- dlls/msxml3/cdata.c | 14 ++++- dlls/msxml3/comment.c | 14 ++++- dlls/msxml3/docfrag.c | 14 ++++- dlls/msxml3/domdoc.c | 1 - dlls/msxml3/entityref.c | 14 ++++- dlls/msxml3/node.c | 7 +-- dlls/msxml3/pi.c | 14 ++++- dlls/msxml3/tests/domdoc.c | 159 +++++++++++++++++++++++++++++--------------- dlls/msxml3/text.c | 14 ++++- 10 files changed, 197 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8bd54c56e7c556e62cb96…

1 0

Michael Stefaniuc : comctl32: Drop 'inline' from a function using sigsetjmp .
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: e443948d94b3c4cac9ca5e49339af19aa627bebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e443948d94b3c4cac9ca5e493… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 31 21:45:55 2011 +0100 comctl32: Drop 'inline' from a function using sigsetjmp. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index bd706ac..accbf58 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3594,7 +3594,7 @@ static const IImageListVtbl ImageListImpl_Vtbl = { ImageListImpl_GetOverlayImage }; -static inline BOOL is_valid(HIMAGELIST himl) +static BOOL is_valid(HIMAGELIST himl) { BOOL valid; __TRY

1 0

Michael Stefaniuc : ole32: Drop 'inline' from a function using sigsetjmp.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: e68643f1a1d056e5fcec5810d7c3edb1196ba3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68643f1a1d056e5fcec5810d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 31 21:49:48 2011 +0100 ole32: Drop 'inline' from a function using sigsetjmp. --- dlls/ole32/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 395b21f..91f0499 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -168,7 +168,7 @@ static HRESULT create_stream_on_mip_ro(const InterfaceData *mip, IStream **strea return CreateStreamOnHGlobal(hglobal, TRUE, stream); } -static inline void rot_entry_delete(struct rot_entry *rot_entry) +static void rot_entry_delete(struct rot_entry *rot_entry) { if (rot_entry->cookie) {

1 0

Andrew Talbot : comdlg32: Remove unneeded address-of operator from array name.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: f0465fb0215f4523214ed80fd5f1e3f619bf6e11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0465fb0215f4523214ed80fd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 31 21:19:16 2011 +0000 comdlg32: Remove unneeded address-of operator from array name. --- dlls/comdlg32/itemdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 9e90276..f700891 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1350,7 +1350,7 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) button[1].dwData = 0; button[1].iString = 0; - SendMessageW(htoolbar, TB_ADDBUTTONSW, 2, (LPARAM)&button); + SendMessageW(htoolbar, TB_ADDBUTTONSW, 2, (LPARAM)button); SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(24,24)); SendMessageW(htoolbar, TB_AUTOSIZE, 0, 0); }

1 0