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

Thomas Faber : dplayx: Fix broken pointer arithmetic.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 4b1fb32d9dba1eee5e4ac09bd5a97541a32ff652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1fb32d9dba1eee5e4ac09bd… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Mar 25 11:11:25 2014 +0100 dplayx: Fix broken pointer arithmetic. --- dlls/dplayx/dplayx_global.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 55a7386..f68cad0 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -84,8 +84,9 @@ static LPVOID lpSharedStaticData = NULL; typedef struct { BOOL used; - DWORD data[dwBlockSize-sizeof(DWORD)]; + BYTE data[dwBlockSize - sizeof(BOOL)]; } DPLAYX_MEM_SLICE; +C_ASSERT(sizeof(DPLAYX_MEM_SLICE) == dwBlockSize); static DPLAYX_MEM_SLICE* lpMemArea; @@ -100,7 +101,7 @@ static void DPLAYX_PrivHeapFree( LPVOID addr ) return; } - lpAddrStart = (char*)addr - sizeof(DWORD); /* Find block header */ + lpAddrStart = CONTAINING_RECORD(addr, DPLAYX_MEM_SLICE, data); /* Find block header */ dwBlockUsed = ((BYTE*)lpAddrStart - (BYTE*)lpMemArea)/dwBlockSize; lpMemArea[ dwBlockUsed ].used = FALSE; @@ -111,10 +112,10 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) LPVOID lpvArea = NULL; UINT uBlockUsed; - if( size > (dwBlockSize - sizeof(DWORD)) ) + if( size > (dwBlockSize - sizeof(BOOL)) ) { FIXME( "Size exceeded. Request of 0x%08x\n", size ); - size = dwBlockSize - sizeof(DWORD); + size = dwBlockSize - sizeof(BOOL); } /* Find blank area */

1 0

Piotr Caban : user32/tests: Workaround SetForegroundWindow failure due to foreground lock timeout.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 61a92af5cab3714ab747c3bb14fd0f0d917eca8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a92af5cab3714ab747c3bb1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 24 19:31:21 2014 +0100 user32/tests: Workaround SetForegroundWindow failure due to foreground lock timeout. --- dlls/user32/tests/win.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 69f3270..f8c919a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3728,13 +3728,10 @@ todo_wine check_active_state(parent, 0, parent); bret = SetForegroundWindow(popup); -todo_wine { - ok(bret || broken(!bret), "SetForegroundWindow() failed\n"); - if (!bret) - check_active_state(popup, 0, popup); - else +todo_wine + ok(bret, "SetForegroundWindow() failed\n"); + if (bret) check_active_state(popup, popup, popup); - } ok(DestroyWindow(parent), "DestroyWindow() failed\n"); @@ -7507,6 +7504,32 @@ START_TEST(win) if (!RegisterWindowClasses()) assert(0); + hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, + 100, 100, 200, 200, + 0, 0, GetModuleHandleA(NULL), NULL); + assert( hwndMain ); + + if(!SetForegroundWindow(hwndMain)) { + /* workaround for foreground lock timeout */ + INPUT input[2]; + UINT events_no; + + memset(input, 0, sizeof(input)); + input[0].type = INPUT_MOUSE; + input[0].mi.dx = 101; + input[0].mi.dy = 101; + input[0].mi.dwFlags = MOUSEEVENTF_LEFTDOWN; + input[0].type = INPUT_MOUSE; + input[0].mi.dx = 101; + input[0].mi.dy = 101; + input[0].mi.dwFlags = MOUSEEVENTF_LEFTUP; + events_no = SendInput(2, input, sizeof(input[0])); + ok(events_no == 2, "SendInput returned %d\n", events_no); + ok(SetForegroundWindow(hwndMain), "SetForegroundWindow failed\n"); + } + SetLastError(0xdeafbeef); GetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC); is_win9x = (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); @@ -7518,17 +7541,11 @@ START_TEST(win) test_FindWindowEx(); test_SetParent(); - hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", - WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP, - 100, 100, 200, 200, - 0, 0, GetModuleHandleA(NULL), NULL); hwndMain2 = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window 2", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); - assert( hwndMain ); assert( hwndMain2 ); our_pid = GetWindowThreadProcessId(hwndMain, NULL);

1 0

Nikolay Sivov : winhttp: Move allocation after input validation to fix leaks (Coverity).
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: e3a94656f2394c0ac0ec2a3be996a083ce124204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a94656f2394c0ac0ec2a3be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 25 08:04:45 2014 +0400 winhttp: Move allocation after input validation to fix leaks (Coverity). --- dlls/winhttp/cookie.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index af881ea..6e104b2 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -134,10 +134,6 @@ static cookie_t *parse_cookie( const WCHAR *string ) const WCHAR *p; int len; - if (!(cookie = heap_alloc_zero( sizeof(cookie_t) ))) return NULL; - - list_init( &cookie->entry ); - if (!(p = strchrW( string, '=' ))) { WARN("no '=' in %s\n", debugstr_w(string)); @@ -148,6 +144,11 @@ static cookie_t *parse_cookie( const WCHAR *string ) WARN("empty cookie name in %s\n", debugstr_w(string)); return NULL; } + + if (!(cookie = heap_alloc_zero( sizeof(cookie_t) ))) return NULL; + + list_init( &cookie->entry ); + len = p - string; if (!(cookie->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) {

1 0

Nikolay Sivov : scrrun: Close find handle on error (Coverity).
by Alexandre Julliard March 25, 2014

March 25, 2014

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 : ole32: Fix some leaks on early returns (Coverity).
by Alexandre Julliard March 25, 2014

March 25, 2014

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

Vincent Povirk : gdiplus: Copy palettes with bitmaps.
by Alexandre Julliard March 25, 2014

March 25, 2014

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

Vincent Povirk : gdiplus: Remove a useless comparison.
by Alexandre Julliard March 25, 2014

March 25, 2014

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

Nikolay Sivov : comctl32/tests: Fix uninitialized variable case (Coverity) .
by Alexandre Julliard March 25, 2014

March 25, 2014

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 leaks on error paths (Coverity).
by Alexandre Julliard March 25, 2014

March 25, 2014

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 : comctl32: Fix a leak on error path (Coverity).
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: d60910fc149d49639b4e8d077f0bb1099cf8016f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60910fc149d49639b4e8d077… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 24 21:35:02 2014 +0400 comctl32: Fix a leak on error path (Coverity). --- dlls/comctl32/dpa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 41fb799..148d3f1 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -129,8 +129,10 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, if (!hDpa) return E_OUTOFMEMORY; - if (!DPA_Grow (hDpa, streamData.dwItems)) + if (!DPA_Grow (hDpa, streamData.dwItems)) { + DPA_Destroy (hDpa); return E_OUTOFMEMORY; + } /* load data from the stream into the dpa */ ptr = hDpa->ptrs;

1 0