March 2014 - Wine-commits - list.winehq.org

Jacek Caban : dxgi1_2.idl: Added new file.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 9301c580d04aa0453d59a8013e1ad18bdc266eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9301c580d04aa0453d59a8013… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 25 16:41:41 2014 +0100 dxgi1_2.idl: Added new file. --- include/Makefile.in | 1 + include/dxgi1_2.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 525e4eb..ebdc96b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -39,6 +39,7 @@ PUBLIC_IDL_H_SRCS = \ dwrite.idl \ dwrite_1.idl \ dxgi.idl \ + dxgi1_2.idl \ endpointvolume.idl \ exdisp.idl \ fusion.idl \ diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl new file mode 100644 index 0000000..27dc34c --- /dev/null +++ b/include/dxgi1_2.idl @@ -0,0 +1,47 @@ +/* + * Copyright 2014 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "dxgi.idl"; + +typedef enum _DXGI_OFFER_RESOURCE_PRIORITY { + DXGI_OFFER_RESOURCE_PRIORITY_LOW = 1, + DXGI_OFFER_RESOURCE_PRIORITY_NORMAL, + DXGI_OFFER_RESOURCE_PRIORITY_HIGH +} DXGI_OFFER_RESOURCE_PRIORITY; + +[ + object, + uuid(05008617-fbfd-4051-a790-144884b4f6a9), + local, + pointer_default(unique) +] +interface IDXGIDevice2 : IDXGIDevice1 +{ + HRESULT OfferResources( + [in] UINT NumResources, + [in, size_is(NumResources)] IDXGIResource *const *ppResources, + [in] DXGI_OFFER_RESOURCE_PRIORITY Priority); + + HRESULT ReclaimResources( + [in] UINT NumResources, + [in, size_is(NumResources)] IDXGIResource *const *ppResources, + [out, size_is(NumResources)] BOOL *pDiscarded); + + HRESULT EnqueueSetEvent( + [in] HANDLE hEvent); +}

1 0

André Hentschel : setupapi: Don' t confuse ARM with ARM64.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 99c151a1468e9f7272ca0a772ce7f9368fef5243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c151a1468e9f7272ca0a772… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 25 19:46:04 2014 +0100 setupapi: Don't confuse ARM with ARM64. --- dlls/setupapi/fakedll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index e74a306..8e3dffb 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -278,9 +278,9 @@ static BOOL build_fake_dll( HANDLE file, const WCHAR *name ) #if defined __x86_64__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; #elif defined __aarch64__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; -#elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; +#elif defined __arm__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined __powerpc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #else

1 0

Vincent Povirk : gdiplus: Limit image output to the bounds of the Graphics object.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 526143cb05ade443113107b6b98bb84ef678b7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526143cb05ade443113107b6b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 13 16:28:50 2014 -0500 gdiplus: Limit image output to the bounds of the Graphics object. --- dlls/gdiplus/graphics.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e3bf98e..8f0ea8c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2858,6 +2858,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (use_software) { RECT dst_area; + GpRectF graphics_bounds; GpRect src_area; int i, x, y, src_stride, dst_stride; GpMatrix dst_to_src; @@ -2883,8 +2884,18 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (dst_area.bottom < pti[i].y) dst_area.bottom = pti[i].y; } + stat = get_graphics_bounds(graphics, &graphics_bounds); + if (stat != Ok) return stat; + + if (graphics_bounds.X > dst_area.left) dst_area.left = floorf(graphics_bounds.X); + if (graphics_bounds.Y > dst_area.top) dst_area.top = floorf(graphics_bounds.Y); + if (graphics_bounds.X + graphics_bounds.Width < dst_area.right) dst_area.right = ceilf(graphics_bounds.X + graphics_bounds.Width); + if (graphics_bounds.Y + graphics_bounds.Height < dst_area.bottom) dst_area.bottom = ceilf(graphics_bounds.Y + graphics_bounds.Height); + TRACE("dst_area: %s\n", wine_dbgstr_rect(&dst_area)); + if (IsRectEmpty(&dst_area)) return Ok; + m11 = (ptf[1].X - ptf[0].X) / srcwidth; m21 = (ptf[2].X - ptf[0].X) / srcheight; mdx = ptf[0].X - m11 * srcx - m21 * srcy;

1 0

Vincent Povirk : gdiplus: Remove a useless comparison.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 392d3b657ab18eaccf809d4210a05d39bb92e346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392d3b657ab18eaccf809d421… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 24 14:09:04 2014 -0500 gdiplus: Remove a useless comparison. --- dlls/gdiplus/graphics.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8f0ea8c..56d785e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2941,8 +2941,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (stat != Ok) { - if (src_data != dst_data) - GdipFree(src_data); + GdipFree(src_data); GdipFree(dst_data); return stat; }

1 0

Vincent Povirk : gdiplus: Copy palettes with bitmaps.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 500a96d07964970b7d6e3f4d699dc28051180bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500a96d07964970b7d6e3f4d6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 24 16:36:35 2014 -0500 gdiplus: Copy palettes with bitmaps. --- dlls/gdiplus/image.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f734274..20098ca 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1252,6 +1252,28 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, srcBitmap->stride, srcBitmap->bits + srcBitmap->stride * area.Y + PIXELFORMATBPP(srcBitmap->format) * area.X / 8, srcBitmap->format, srcBitmap->image.palette); + + if (stat == Ok && srcBitmap->image.palette) + { + ColorPalette *src_palette, *dst_palette; + + src_palette = srcBitmap->image.palette; + + dst_palette = GdipAlloc(sizeof(UINT) * 2 + sizeof(ARGB) * src_palette->Count); + + if (dst_palette) + { + dst_palette->Flags = src_palette->Flags; + dst_palette->Count = src_palette->Count; + memcpy(dst_palette->Entries, src_palette->Entries, sizeof(ARGB) * src_palette->Count); + + GdipFree((*dstBitmap)->image.palette); + (*dstBitmap)->image.palette = dst_palette; + } + else + stat = OutOfMemory; + } + if (stat != Ok) GdipDisposeImage((GpImage*)*dstBitmap); }

1 0

Nikolay Sivov : comctl32/tests: Fix uninitialized variable case (Coverity) .
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 9d1232a1ec26d5dc12da2e067bf11d9f9f882741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1232a1ec26d5dc12da2e067… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 25 07:55:55 2014 +0400 comctl32/tests: Fix uninitialized variable case (Coverity). --- dlls/comctl32/tests/header.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index d6e5a01..2c1320b 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -442,6 +442,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, PARENT_SEQ_INDEX, &msg); }

1 0

Nikolay Sivov : ole32: Fix some leaks on early returns (Coverity).
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 43b5f46fcd39dce13ed3909cb514f156302e1d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b5f46fcd39dce13ed3909cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 25 07:57:49 2014 +0400 ole32: Fix some leaks on early returns (Coverity). --- dlls/ole32/moniker.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 970cc84..d694df9 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1248,8 +1248,10 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) absFile=pathDec[nbElm-1]; /* failed if the path represents a directory and not an absolute file name*/ - if (!lstrcmpW(absFile, bkslashW)) + if (!lstrcmpW(absFile, bkslashW)) { + CoTaskMemFree(pathDec); return MK_E_INVALIDEXTENSION; + } /* get the extension of the file */ extension = NULL; @@ -1257,8 +1259,10 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) for(i = length-1; (i >= 0) && *(extension = &absFile[i]) != '.'; i--) /* nothing */; - if (!extension || !lstrcmpW(extension, dotW)) + if (!extension || !lstrcmpW(extension, dotW)) { + CoTaskMemFree(pathDec); return MK_E_INVALIDEXTENSION; + } res=RegQueryValueW(HKEY_CLASSES_ROOT, extension, NULL, &sizeProgId);

1 0

Nikolay Sivov : ole32: Fix leaks on error paths (Coverity).
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 4768ac4413e85a459457903c4fdf8388143f22a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4768ac4413e85a459457903c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 25 07:58:08 2014 +0400 ole32: Fix leaks on error paths (Coverity). --- dlls/ole32/filemoniker.c | 132 +++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index af161fe..06c4798 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -935,11 +935,12 @@ static HRESULT WINAPI FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) { - LPOLESTR pathThis,pathOther,*stringTable1,*stringTable2,commonPath; - IBindCtx *pbind; + LPOLESTR pathThis = NULL, pathOther = NULL,*stringTable1,*stringTable2,commonPath = NULL; + IBindCtx *bindctx; DWORD mkSys; ULONG nb1,nb2,i,sameIdx; BOOL machineNameCase = FALSE; + HRESULT ret; if (ppmkPrefix==NULL) return E_POINTER; @@ -951,81 +952,81 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p /* check if we have the same type of moniker */ IMoniker_IsSystemMoniker(pmkOther,&mkSys); + if (mkSys != MKSYS_FILEMONIKER) + return MonikerCommonPrefixWith(iface, pmkOther, ppmkPrefix); - if(mkSys==MKSYS_FILEMONIKER){ - HRESULT ret; - - ret = CreateBindCtx(0,&pbind); - if (FAILED(ret)) - return ret; - - /* create a string based on common part of the two paths */ - - ret = IMoniker_GetDisplayName(iface,pbind,NULL,&pathThis); - if (FAILED(ret)) - return ret; - ret = IMoniker_GetDisplayName(pmkOther,pbind,NULL,&pathOther); - if (FAILED(ret)) - return ret; - - nb1=FileMonikerImpl_DecomposePath(pathThis,&stringTable1); - if (FAILED(nb1)) - return nb1; - nb2=FileMonikerImpl_DecomposePath(pathOther,&stringTable2); - if (FAILED(nb2)) - { - free_stringtable(stringTable1); - return nb2; - } - - if (nb1==0 || nb2==0) - { - free_stringtable(stringTable1); - free_stringtable(stringTable2); - return MK_E_NOPREFIX; - } - - commonPath=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(min(lstrlenW(pathThis),lstrlenW(pathOther))+1)); - if (!commonPath) - return E_OUTOFMEMORY; + ret = CreateBindCtx(0, &bindctx); + if (FAILED(ret)) + return ret; - *commonPath=0; + /* create a string based on common part of the two paths */ + ret = IMoniker_GetDisplayName(iface, bindctx, NULL, &pathThis); + if (FAILED(ret)) + goto failed; - for(sameIdx=0; ( (stringTable1[sameIdx]!=NULL) && - (stringTable2[sameIdx]!=NULL) && - (lstrcmpiW(stringTable1[sameIdx],stringTable2[sameIdx])==0)); sameIdx++); + ret = IMoniker_GetDisplayName(pmkOther, bindctx, NULL, &pathOther); + if (FAILED(ret)) + goto failed; - if (sameIdx > 1 && *stringTable1[0]=='\\' && *stringTable2[1]=='\\'){ + nb1 = FileMonikerImpl_DecomposePath(pathThis, &stringTable1); + if (FAILED(nb1)) { + ret = nb1; + goto failed; + } - machineNameCase = TRUE; + nb2 = FileMonikerImpl_DecomposePath(pathOther, &stringTable2); + if (FAILED(nb2)) { + ret = nb2; + goto failed; + } - for(i=2;i<sameIdx;i++) + if (nb1 == 0 || nb2 == 0) { + ret = MK_E_NOPREFIX; + goto failed; + } - if( (*stringTable1[i]=='\\') && (i+1 < sameIdx) && (*stringTable1[i+1]=='\\') ){ - machineNameCase = FALSE; - break; - } - } + commonPath = CoTaskMemAlloc(sizeof(WCHAR)*(min(lstrlenW(pathThis),lstrlenW(pathOther))+1)); + if (!commonPath) { + ret = E_OUTOFMEMORY; + goto failed; + } - if (machineNameCase && *stringTable1[sameIdx-1]=='\\') - sameIdx--; + *commonPath = 0; + for(sameIdx=0; ( (stringTable1[sameIdx]!=NULL) && + (stringTable2[sameIdx]!=NULL) && + (lstrcmpiW(stringTable1[sameIdx],stringTable2[sameIdx])==0)); sameIdx++); - if (machineNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) ) - ret = MK_E_NOPREFIX; - else - { - for(i=0;i<sameIdx;i++) - strcatW(commonPath,stringTable1[i]); + if (sameIdx > 1 && *stringTable1[0]=='\\' && *stringTable2[1]=='\\'){ + machineNameCase = TRUE; - free_stringtable(stringTable1); - free_stringtable(stringTable2); - ret = CreateFileMoniker(commonPath,ppmkPrefix); + for(i=2;i<sameIdx;i++) + if( (*stringTable1[i]=='\\') && (i+1 < sameIdx) && (*stringTable1[i+1]=='\\') ){ + machineNameCase = FALSE; + break; } - HeapFree(GetProcessHeap(),0,commonPath); - return ret; } + + if (machineNameCase && *stringTable1[sameIdx-1]=='\\') + sameIdx--; + + if (machineNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) ) + ret = MK_E_NOPREFIX; else - return MonikerCommonPrefixWith(iface,pmkOther,ppmkPrefix); + { + for (i = 0; i < sameIdx; i++) + strcatW(commonPath,stringTable1[i]); + ret = CreateFileMoniker(commonPath, ppmkPrefix); + } + +failed: + IBindCtx_Release(bindctx); + CoTaskMemFree(pathThis); + CoTaskMemFree(pathOther); + CoTaskMemFree(commonPath); + free_stringtable(stringTable1); + free_stringtable(stringTable2); + + return ret; } /****************************************************************************** @@ -1105,8 +1106,7 @@ lend: CoTaskMemFree(strgtable); } - if (word) - CoTaskMemFree(word); + CoTaskMemFree(word); return ret; }

1 0

Nikolay Sivov : scrrun: Close find handle on error (Coverity).
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 293bae153d4c092cc74e7fb5f19290ce7aa160da URL: http://source.winehq.org/git/wine.git/?a=commit;h=293bae153d4c092cc74e7fb5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 25 08:00:39 2014 +0400 scrrun: Close find handle on error (Coverity). --- dlls/scrrun/filesystem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ec4890a..f4c1997 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3189,8 +3189,10 @@ static inline HRESULT copy_file(const WCHAR *source, DWORD source_len, return CTL_E_FILENOTFOUND; src_len = get_parent_folder_name(source, source_len); - if(src_len+1 >= MAX_PATH) + if(src_len+1 >= MAX_PATH) { + FindClose(f); return E_FAIL; + } if(src_len) { memcpy(src_path, source, src_len*sizeof(WCHAR)); src_path[src_len++] = '\\';

1 0

Nikolay Sivov : scrrun: Fix a find handle leak (Coverity).
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: c3f5fc58bdf5c4280d434860ce3821916cf50957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f5fc58bdf5c4280d434860c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 25 08:00:56 2014 +0400 scrrun: Fix a find handle leak (Coverity). --- dlls/scrrun/filesystem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f4c1997..33344e4 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3335,10 +3335,9 @@ static HRESULT copy_folder(const WCHAR *source, DWORD source_len, const WCHAR *d FindClose(f); return CTL_E_FILEALREADYEXISTS; } - }else { - FindClose(f); - return create_error(GetLastError()); } + + FindClose(f); return create_error(GetLastError()); } copied = TRUE;

1 0