wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Michael Stefaniuc : riched20: IDC_IBEAM is already an int resource ( PVS-Studio).
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 54d3816eb835d73c1c68f8201cc68883e96bcaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d3816eb835d73c1c68f8201… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:06:55 2015 +0100 riched20: IDC_IBEAM is already an int resource (PVS-Studio). --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ca316d2..7632d47 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4818,7 +4818,7 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) wcW.cbWndExtra = sizeof(ME_TextEditor *); wcW.hInstance = NULL; /* hInstance would register DLL-local class */ wcW.hIcon = NULL; - wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); + wcW.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_IBEAM); wcW.hbrBackground = GetStockObject(NULL_BRUSH); wcW.lpszMenuName = NULL; @@ -4844,7 +4844,7 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) wcA.cbWndExtra = sizeof(ME_TextEditor *); wcA.hInstance = NULL; /* hInstance would register DLL-local class */ wcA.hIcon = NULL; - wcA.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); + wcA.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_IBEAM); wcA.hbrBackground = GetStockObject(NULL_BRUSH); wcA.lpszMenuName = NULL; wcA.lpszClassName = RICHEDIT_CLASS20A;

1 0

Michael Stefaniuc : msvcrt: Avoid identical if and else bodies (PVS-Studio ).
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: e67a65c59e7013f22c3a873874e9552deef3b68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67a65c59e7013f22c3a87387… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:03:50 2015 +0100 msvcrt: Avoid identical if and else bodies (PVS-Studio). --- dlls/msvcrt/scanf.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index e85f343..9322704 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -423,8 +423,7 @@ _FUNCTION_ { st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(double); - else if (l_prefix) _SET_NUMBER_(double); + if (L_prefix || l_prefix) _SET_NUMBER_(double); else _SET_NUMBER_(float); } }

1 0

Nikolay Sivov : wshom.ocx: Implement RegWrite().
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 4588bb117094f71de5ac9601fbc758ad6a8c9b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4588bb117094f71de5ac9601f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 18 08:39:25 2015 +0300 wshom.ocx: Implement RegWrite(). --- dlls/wshom.ocx/Makefile.in | 2 +- dlls/wshom.ocx/shell.c | 156 +++++++++++++++++++++++++++++++++++-------- dlls/wshom.ocx/tests/wshom.c | 81 +++++++++++++++++++++- 3 files changed, 210 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4588bb117094f71de5ac9…

1 0

Mark Harmstone : comctl32: Themed buttons should not draw in System if font unset.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 129862f3694fdd4f0badfc6f046a19b70810cf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=129862f3694fdd4f0badfc6f0… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 17 23:39:16 2015 +0000 comctl32: Themed buttons should not draw in System if font unset. --- dlls/comctl32/theme_button.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 9b0a5cf..5a3b4b4 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -181,8 +181,10 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN hPrevFont = SelectObject(hDC, font); created_font = TRUE; } - } else + } else { font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + hPrevFont = SelectObject(hDC, font); + } GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); @@ -243,8 +245,10 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN hPrevFont = SelectObject(hDC, font); created_font = TRUE; } - } else + } else { font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + hPrevFont = SelectObject(hDC, font); + } GetClientRect(hwnd, &bgRect); textRect = bgRect;

1 0

Mark Harmstone : comctl32: Do not call HEADER_FillItemFrame twice in a row.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 6a8da85c3bcee29d4c7fcb9f96e4ec20b4e9426c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8da85c3bcee29d4c7fcb9f9… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 17 22:35:27 2015 +0000 comctl32: Do not call HEADER_FillItemFrame twice in a row. --- dlls/comctl32/header.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index ac924fd..59f2c12 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -392,10 +392,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU if (ret) return phdi->rect.right; } else - { - HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); - } if (phdi->bDown) { r.left += 2;

1 0

Thomas Faber : gdi32/tests: Avoid variable length arrays (MSVC).
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 656bc70f80e72774f3d266308157f44c89bce6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=656bc70f80e72774f3d266308… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Feb 16 09:14:34 2015 +0100 gdi32/tests: Avoid variable length arrays (MSVC). --- dlls/gdi32/tests/bitmap.c | 2 +- dlls/gdi32/tests/pen.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 351a5ca..84f843f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1588,7 +1588,7 @@ static BOOL is_black_pen( COLORREF fg, COLORREF bg, int r, int g, int b ) static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, int b ) { static const WORD pattern_bits[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors ) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *info = (BITMAPINFO *)buffer; RGBQUAD *colors = info->bmiColors; WORD bits[16]; diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 156700f..43f00d8 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -512,7 +512,7 @@ static void test_ps_userstyle(void) LOGBRUSH lb; HPEN pen; INT size, i; - char buffer[offsetof(EXTLOGPEN, elpStyleEntry[16])]; + char buffer[offsetof(EXTLOGPEN, elpStyleEntry) + 16 * sizeof(DWORD)]; EXTLOGPEN *ext_pen = (EXTLOGPEN *)buffer; lb.lbColor = 0x00ff0000; @@ -569,7 +569,7 @@ static void test_ps_userstyle(void) static void test_brush_pens(void) { - char buffer[offsetof(EXTLOGPEN, elpStyleEntry[16])]; + char buffer[offsetof(EXTLOGPEN, elpStyleEntry) + 16 * sizeof(DWORD)]; EXTLOGPEN *elp = (EXTLOGPEN *)buffer; LOGBRUSH lb; HPEN pen = 0;

1 0

Thomas Faber : winegstreamer: Avoid empty initializer braces.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: ed761920ca7a6803485a74bb3a08a3762b5951b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed761920ca7a6803485a74bb3… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 14 09:35:56 2015 +0100 winegstreamer: Avoid empty initializer braces. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4e5f04d..de48efd 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -707,7 +707,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS PIN_INFO piOutput; const char *typename; char *name; - AM_MEDIA_TYPE amt = { }; + AM_MEDIA_TYPE amt = {{0}}; GstCaps *caps; GstStructure *arg; GstPad *mypad;

1 0

Thomas Faber : quartz: Avoid empty initializer braces.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 7f9a63e5fdb0636bd68e3a7b9a18423460d3f365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9a63e5fdb0636bd68e3a7b9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 14 09:33:23 2015 +0100 quartz: Avoid empty initializer braces. --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9f96654..8e34655 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -916,7 +916,7 @@ static LONG cookie_counter = 1; static DWORD WINAPI DSoundAdviseThread(LPVOID lpParam) { DSoundRenderImpl *This = lpParam; - struct dsoundrender_timer head = { }; + struct dsoundrender_timer head = {NULL}; MSG msg; TRACE("(%p): Main Loop\n", This);

1 0

Thomas Faber : wininet: Avoid empty initializer braces.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: d742f6e821e819efcb5fe24f8fe331d98ad47c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d742f6e821e819efcb5fe24f8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 14 09:27:12 2015 +0100 wininet: Avoid empty initializer braces. --- dlls/wininet/internet.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 65bb434..7eddb2c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -522,11 +522,12 @@ static void free_global_proxy( void ) static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) { static const WCHAR fmt[] = {'%','s',':','%','u',0}; - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH] = {}; - WCHAR username[INTERNET_MAX_USER_NAME_LENGTH] = {}; - WCHAR password[INTERNET_MAX_PASSWORD_LENGTH] = {}; + WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; + WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; URL_COMPONENTSW uc; + hostname[0] = username[0] = password[0] = 0; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); uc.lpszHostName = hostname;

1 0

Stefan Dösinger : ddraw/tests: Create a device in test_surface_discard.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 5408c5ea34e3329c9e6a582c08f19b298de11345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5408c5ea34e3329c9e6a582c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 16 19:10:42 2015 +0100 ddraw/tests: Create a device in test_surface_discard. --- dlls/ddraw/tests/ddraw1.c | 24 ++++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 24 ++++++++++++++---------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3117d51..a26fd65 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3951,10 +3951,11 @@ static void test_surface_lock(void) static void test_surface_discard(void) { IDirectDraw *ddraw; + IDirect3DDevice *device; HRESULT hr; HWND window; DDSURFACEDESC ddsd; - IDirectDrawSurface *surface, *primary; + IDirectDrawSurface *surface, *target; void *addr; static const struct { @@ -3974,14 +3975,16 @@ static void test_surface_discard(void) 0, 0, 640, 480, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &primary, NULL); + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { @@ -4016,7 +4019,7 @@ static void test_surface_discard(void) hr = IDirectDrawSurface_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(primary, NULL, surface, NULL, DDBLT_WAIT, NULL); + hr = IDirectDrawSurface_Blt(target, NULL, surface, NULL, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); memset(&ddsd, 0, sizeof(ddsd)); @@ -4034,7 +4037,8 @@ static void test_surface_discard(void) ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); } - IDirectDrawSurface_Release(primary); + IDirectDrawSurface_Release(target); + IDirect3DDevice_Release(device); IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f584971..090f731 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4622,10 +4622,11 @@ static void test_surface_lock(void) static void test_surface_discard(void) { IDirectDraw2 *ddraw; + IDirect3DDevice2 *device; HRESULT hr; HWND window; DDSURFACEDESC ddsd; - IDirectDrawSurface *surface, *primary; + IDirectDrawSurface *surface, *target; void *addr; static const struct { @@ -4645,14 +4646,16 @@ static void test_surface_discard(void) 0, 0, 640, 480, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + IDirectDraw2_Release(ddraw); + return; + } - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &primary, NULL); + hr = IDirect3DDevice2_GetRenderTarget(device, &target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { @@ -4687,7 +4690,7 @@ static void test_surface_discard(void) hr = IDirectDrawSurface_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(primary, NULL, surface, NULL, DDBLT_WAIT, NULL); + hr = IDirectDrawSurface_Blt(target, NULL, surface, NULL, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); memset(&ddsd, 0, sizeof(ddsd)); @@ -4705,7 +4708,8 @@ static void test_surface_discard(void) ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); } - IDirectDrawSurface_Release(primary); + IDirectDrawSurface_Release(target); + IDirect3DDevice2_Release(device); IDirectDraw2_Release(ddraw); DestroyWindow(window); }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
42
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 February 2015