wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Huw Davies : shell32: Use the imagelist to determine the icon size.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 734dc8f200dfdec1a7bd746200fba72e870b5f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=734dc8f200dfdec1a7bd74620… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 19 13:13:40 2017 +0100 shell32: Use the imagelist to determine the icon size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 7beb479..737f4d5 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -298,6 +298,17 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI LeaveCriticalSection(&SHELL32_SicCS); return ret; } + +static BOOL get_imagelist_icon_size(int list, SIZE *size) +{ + HIMAGELIST image_list; + + if (list < SHIL_LARGE || list > SHIL_SMALL) return FALSE; + image_list = (list == SHIL_LARGE) ? ShellBigIconList : ShellSmallIconList; + + return ImageList_GetIconSize( image_list, &size->cx, &size->cy ); +} + /**************************************************************************** * SIC_LoadIcon [internal] * @@ -311,11 +322,12 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) HICON hiconLargeShortcut; HICON hiconSmallShortcut; int ret; + SIZE size; - PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), &hiconLarge, 0, 1, 0 ); - PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), &hiconSmall, 0, 1, 0 ); + get_imagelist_icon_size( SHIL_LARGE, &size ); + PrivateExtractIconsW( sSourceFile, dwSourceIndex, size.cx, size.cy, &hiconLarge, 0, 1, 0 ); + get_imagelist_icon_size( SHIL_SMALL, &size ); + PrivateExtractIconsW( sSourceFile, dwSourceIndex, size.cx, size.cy, &hiconSmall, 0, 1, 0 ); if ( !hiconLarge || !hiconSmall) {

1 0

Huw Davies : shell32: Avoid leaking icon handles.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 524e316a144c6d605908ddbe39487644065c4364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=524e316a144c6d605908ddbe3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 19 13:13:39 2017 +0100 shell32: Avoid leaking icon handles. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index c3284a2..7beb479 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -305,10 +305,12 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI * gets small/big icon by number from a file */ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) -{ HICON hiconLarge=0; +{ + HICON hiconLarge=0; HICON hiconSmall=0; HICON hiconLargeShortcut; HICON hiconSmallShortcut; + int ret; PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), &hiconLarge, 0, 1, 0 ); @@ -327,6 +329,8 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) hiconSmallShortcut = SIC_OverlayShortcutImage(hiconSmall, FALSE); if (NULL != hiconLargeShortcut && NULL != hiconSmallShortcut) { + DestroyIcon( hiconLarge ); + DestroyIcon( hiconSmall ); hiconLarge = hiconLargeShortcut; hiconSmall = hiconSmallShortcut; } @@ -339,8 +343,12 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) } } - return SIC_IconAppend (sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags); + ret = SIC_IconAppend( sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags ); + DestroyIcon( hiconLarge ); + DestroyIcon( hiconSmall ); + return ret; } + /***************************************************************************** * SIC_Initialize [internal] */

1 0

Michael Stefaniuc : comctl32/tests: Check the correct last error code.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: c7c8d24bf9ae0be03f73d1a9ff8225bfd17d6394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c8d24bf9ae0be03f73d1a9f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 19 01:24:15 2017 +0200 comctl32/tests: Check the correct last error code. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/animate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/animate.c b/dlls/comctl32/tests/animate.c index c64dbfa..fab345b 100644 --- a/dlls/comctl32/tests/animate.c +++ b/dlls/comctl32/tests/animate.c @@ -160,8 +160,9 @@ static void test_play(void) SetLastError(0xdeadbeef); res = SendMessageA(hAnimateWnd, ACM_PLAY, (WPARAM) -1, MAKELONG(0, -1)); + err = GetLastError(); ok(res == 0, "Play should have failed\n"); - ok(err == ERROR_RESOURCE_NAME_NOT_FOUND, "Expected 1814, got %u\n", err); + ok(err == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", err); destroy_animate(); create_animate(0, 0);

1 0

Huw Davies : oleaut32: Use VariantInit() rather than open coding it.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: f506ffc6d6fbf577cfaec32ee781d7fc932995d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f506ffc6d6fbf577cfaec32ee… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 18 12:07:03 2017 +0100 oleaut32: Use VariantInit() rather than open coding it. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index ebb6183..2151fc9 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -129,7 +129,7 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, if (SUCCEEDED(hRet)) { /* Convert the property to the requested type */ - V_VT(&dstVar) = VT_EMPTY; + VariantInit(&dstVar); hRet = VariantChangeTypeEx(&dstVar, &srcVar, lcid, dwFlags, vt); VariantClear(&srcVar);

1 0

Alistair Leslie-Hughes : oleaut32: Remove redundant call to VariantClear() .
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: c082edb4bd37ba05648fe9741a395f7658dc9225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c082edb4bd37ba05648fe9741… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 18 12:07:02 2017 +0100 oleaut32: Remove redundant call to VariantClear(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index fc5a025..ebb6183 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -134,10 +134,7 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, VariantClear(&srcVar); if (SUCCEEDED(hRet)) - { VARIANT_CopyData(&dstVar, vt, pOut); - VariantClear(&srcVar); - } } else hRet = DISP_E_TYPEMISMATCH;

1 0

Michael Stefaniuc : wineps.drv: Use SetRect/ SetRectEmpty instead of open coding them.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: e70eb5366950486a55fd0fe238190997afbb670f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70eb5366950486a55fd0fe23… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:04 2017 +0200 wineps.drv: Use SetRect/SetRectEmpty instead of open coding them. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 11 +++-------- dlls/wineps.drv/graphics.c | 28 ++++++++-------------------- dlls/wineps.drv/init.c | 23 +++++++---------------- 3 files changed, 18 insertions(+), 44 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 435376c..636ad2a 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -36,6 +36,7 @@ #include "winbase.h" #include "wingdi.h" #include "wine/wingdi16.h" +#include "winuser.h" #include "winreg.h" #include "psdrv.h" #include "wine/debug.h" @@ -139,17 +140,11 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, RECT *r = out_data; if(!physDev->job.banding) { physDev->job.banding = TRUE; - r->left = 0; - r->top = 0; - r->right = physDev->horzRes; - r->bottom = physDev->vertRes; + SetRect(r, 0, 0, physDev->horzRes, physDev->vertRes); TRACE("NEXTBAND returning %s\n", wine_dbgstr_rect(r)); return 1; } - r->left = 0; - r->top = 0; - r->right = 0; - r->bottom = 0; + SetRectEmpty(r); TRACE("NEXTBAND rect to 0,0 - 0,0\n" ); physDev->job.banding = FALSE; return EndPage( dev->hdc ); diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 7fa0727..ab6fe45 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -29,6 +29,9 @@ #if !defined(PI) # define PI M_PI #endif +#include "windef.h" +#include "winbase.h" +#include "winuser.h" #include "psdrv.h" #include "wine/debug.h" @@ -103,10 +106,7 @@ BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) TRACE("%d %d - %d %d\n", left, top, right, bottom); - rect.left = left; - rect.top = top; - rect.right = right; - rect.bottom = bottom; + SetRect(&rect, left, top, right, bottom); LPtoDP( dev->hdc, (POINT *)&rect, 2 ); /* Windows does something truly hacky here. If we're in passthrough mode @@ -140,14 +140,8 @@ BOOL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, { RECT rect[2]; - rect[0].left = left; - rect[0].top = top; - rect[0].right = right; - rect[0].bottom = bottom; - rect[1].left = 0; - rect[1].top = 0; - rect[1].right = ell_width; - rect[1].bottom = ell_height; + SetRect(&rect[0], left, top, right, bottom); + SetRect(&rect[1], 0, 0, ell_width, ell_height); LPtoDP( dev->hdc, (POINT *)rect, 4 ); left = rect[0].left; @@ -200,10 +194,7 @@ static BOOL PSDRV_DrawArc( PHYSDEV dev, INT left, INT top, RECT rect; POINT start, end; - rect.left = left; - rect.top = top; - rect.right = right; - rect.bottom = bottom; + SetRect(&rect, left, top, right, bottom); LPtoDP( dev->hdc, (POINT *)&rect, 2 ); start.x = xstart; start.y = ystart; @@ -290,10 +281,7 @@ BOOL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) TRACE("%d %d - %d %d\n", left, top, right, bottom); - rect.left = left; - rect.top = top; - rect.right = right; - rect.bottom = bottom; + SetRect(&rect, left, top, right, bottom); LPtoDP( dev->hdc, (POINT *)&rect, 2 ); x = (rect.left + rect.right) / 2; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e4e17b0..3b00343 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -33,6 +33,7 @@ #include "winerror.h" #include "winreg.h" #include "winnls.h" +#include "winuser.h" #include "psdrv.h" #include "winspool.h" #include "wine/library.h" @@ -284,22 +285,15 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) if(&page->entry == &physDev->pi->ppd->PageSizes) { FIXME("Can't find page\n"); - physDev->ImageableArea.left = 0; - physDev->ImageableArea.right = 0; - physDev->ImageableArea.bottom = 0; - physDev->ImageableArea.top = 0; + SetRectEmpty(&physDev->ImageableArea); physDev->PageSize.cx = 0; physDev->PageSize.cy = 0; } else if(page->ImageableArea) { /* physDev sizes in device units; ppd sizes in 1/72" */ - physDev->ImageableArea.left = page->ImageableArea->llx * - physDev->logPixelsX / 72; - physDev->ImageableArea.right = page->ImageableArea->urx * - physDev->logPixelsX / 72; - physDev->ImageableArea.bottom = page->ImageableArea->lly * - physDev->logPixelsY / 72; - physDev->ImageableArea.top = page->ImageableArea->ury * - physDev->logPixelsY / 72; + SetRect(&physDev->ImageableArea, page->ImageableArea->llx * physDev->logPixelsX / 72, + page->ImageableArea->ury * physDev->logPixelsY / 72, + page->ImageableArea->urx * physDev->logPixelsX / 72, + page->ImageableArea->lly * physDev->logPixelsY / 72); physDev->PageSize.cx = page->PaperDimension->x * physDev->logPixelsX / 72; physDev->PageSize.cy = page->PaperDimension->y * @@ -323,10 +317,7 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) physDev->logPixelsY / 254; } else { FIXME("Odd dmFields %x\n", physDev->Devmode->dmPublic.dmFields); - physDev->ImageableArea.left = 0; - physDev->ImageableArea.right = 0; - physDev->ImageableArea.bottom = 0; - physDev->ImageableArea.top = 0; + SetRectEmpty(&physDev->ImageableArea); physDev->PageSize.cx = 0; physDev->PageSize.cy = 0; }

1 0

Michael Stefaniuc : avifil32: Use SetRectEmpty() instead of memset().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 78c49a4d32d056313c1e1a8486a2956bebaec647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c49a4d32d056313c1e1a848… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:03 2017 +0200 avifil32: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/wavfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 32a6788..d2d203b 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -314,7 +314,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface, IAVIStream **avis This->sInfo.dwStart = 0; This->sInfo.dwInitialFrames = 0; This->sInfo.dwFormatChangeCount = 0; - memset(&This->sInfo.rcFrame, 0, sizeof(This->sInfo.rcFrame)); + SetRectEmpty(&This->sInfo.rcFrame); This->fInfo.dwStreams = 1; This->fInfo.dwScale = This->sInfo.dwScale;

1 0

Michael Stefaniuc : user32: Use SetRectEmpty() instead of memset().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 79147c8658a05cdcc0a1086937f42109a8d0c2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=79147c8658a05cdcc0a108693… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:02 2017 +0200 user32: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 230f8da..6b47f05 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -417,7 +417,7 @@ static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect /* Index <= 0 is legal even on empty listboxes */ if (index && (index >= descr->nb_items)) { - memset(rect, 0, sizeof(*rect)); + SetRectEmpty(rect); SetLastError(ERROR_INVALID_INDEX); return LB_ERR; }

1 0

Michael Stefaniuc : amstream/tests: Use SetRectEmpty() instead of memset() .
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 0e0cc67c5aa69140a672bfc4942a1b91f4a683d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0cc67c5aa69140a672bfc49… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:00 2017 +0200 amstream/tests: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a7999be..c08f989 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -572,7 +572,7 @@ static void test_IDirectDrawStreamSample(void) EXPECT_REF(surface, 2); surface2 = NULL; - memset(&rect, 0, sizeof(rect)); + SetRectEmpty(&rect); hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface2, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(surface == surface2, "got %p\n", surface2);

1 0

Michael Stefaniuc : credui: Use SetRectEmpty() instead of memset().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: dc0a49f3bb07b73fa63cc80f32c5717d8a455fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0a49f3bb07b73fa63cc80f3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:01 2017 +0200 credui: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 0da4643..a4df9fe 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -216,7 +216,7 @@ static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params * toolinfo.uFlags = TTF_TRACK; toolinfo.hwnd = hwndDlg; toolinfo.uId = TOOLID_INCORRECTPASSWORD; - memset(&toolinfo.rect, 0, sizeof(toolinfo.rect)); + SetRectEmpty(&toolinfo.rect); toolinfo.hinst = NULL; toolinfo.lpszText = wszText; toolinfo.lParam = 0;

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
76
Older →

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 April 2017