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

Michael Stefaniuc : mmdevapi/tests: Remove an unused assignment ( PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 5f28bbcda3be5ecd6fb87c115cdcc6106338f241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f28bbcda3be5ecd6fb87c115… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 09:59:34 2015 +0100 mmdevapi/tests: Remove an unused assignment (PVS-Studio). --- dlls/mmdevapi/tests/render.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index c6b8e90..3a48c8d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1063,7 +1063,6 @@ static void test_clock(int share) last = pos; Sleep(100); - slept += 100; hr = IAudioClock_GetPosition(acl, &pos, NULL); ok(hr == S_OK, "GetPosition failed: %08x\n", hr);

1 0

Michael Stefaniuc : msctf/tests: Remove an unsused assignment (PVS-Studio) .
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 5c9d24702f0199ed3b73f151b478349ecfe8152d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9d24702f0199ed3b73f151b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:01:03 2015 +0100 msctf/tests: Remove an unsused assignment (PVS-Studio). --- dlls/msctf/tests/inputprocessor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index dfa8731..2cc172d 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2174,7 +2174,6 @@ static void test_AssociateFocus(void) test_PrevFocus = FOCUS_IGNORE; DestroyWindow(wnd1); DestroyWindow(wnd2); - test_OnSetFocus = SINK_UNEXPECTED; test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus);

1 0

Michael Stefaniuc : mshtml/tests: Remove an unused assignment (PVS-Studio) .
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 9dcb4004d942a3991e4315f0314bffb7c9ab45bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcb4004d942a3991e4315f03… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:03:00 2015 +0100 mshtml/tests: Remove an unused assignment (PVS-Studio). --- dlls/mshtml/tests/htmldoc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 33f4696..08c31ad 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5737,7 +5737,6 @@ static void test_download(DWORD flags) SET_EXPECT(CountEntries); SET_EXPECT(Exec_HTTPEQUIV_DONE); } - SET_EXPECT(SetStatusText); if(nav_url || support_wbapp) { SET_EXPECT(UpdateUI); SET_EXPECT(Exec_UPDATECOMMANDS);

1 0

Michael Stefaniuc : msvcrt: Clarify comparison of the diff of two unsigneds with 0 (PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 278b70bdd0d765de2976922c3d73202f5eded5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=278b70bdd0d765de2976922c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:07:59 2015 +0100 msvcrt: Clarify comparison of the diff of two unsigneds with 0 (PVS-Studio). --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2e473a9..f803f5d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4254,7 +4254,7 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock_s(void *buf, MSVCRT_size_t buf_size, MS if(c == EOF) break; - if(!MSVCRT_CHECK_PMT_ERR(buf_size-buf_pos > 0, MSVCRT_ERANGE)) { + if(!MSVCRT_CHECK_PMT_ERR(buf_size != buf_pos, MSVCRT_ERANGE)) { memset(buf, 0, buf_size); return 0; }

1 0

Michael Stefaniuc : mmdevapi: Don't check for IID_IDirectSoundCapture8, it is just a define (PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: a514fe7642c2fabdf93f6ab93f1c89b7a345680a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a514fe7642c2fabdf93f6ab93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:09:19 2015 +0100 mmdevapi: Don't check for IID_IDirectSoundCapture8, it is just a define (PVS-Studio). --- dlls/mmdevapi/devenum.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index a78e03d..1a5bf00 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -645,8 +645,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls IDirectSound_Release((IDirectSound*)*ppv); } } - else if (IsEqualIID(riid, &IID_IDirectSoundCapture) - || IsEqualIID(riid, &IID_IDirectSoundCapture8)) + else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) { if (This->flow == eCapture) hr = CoCreateInstance(&CLSID_DirectSoundCapture8, NULL, clsctx, riid, ppv);

1 0

Michael Stefaniuc : winhlp32: Simplify code that happened to work by chance (PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 9bf064a67a9e884d2b6766a065a0a3e50a542ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf064a67a9e884d2b6766a06… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:17:21 2015 +0100 winhlp32: Simplify code that happened to work by chance (PVS-Studio). --- programs/winhlp32/winhelp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index ee5eecd..17fe90c 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1519,11 +1519,11 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_INITMENUPOPUP: win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0); CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_SMALL, - MF_BYCOMMAND | (win->font_scale == 0) ? MF_CHECKED : 0); + (win->font_scale == 0) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_NORMAL, - MF_BYCOMMAND | (win->font_scale == 1) ? MF_CHECKED : 0); + (win->font_scale == 1) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_LARGE, - MF_BYCOMMAND | (win->font_scale == 2) ? MF_CHECKED : 0); + (win->font_scale == 2) ? MF_CHECKED : MF_UNCHECKED); break; case WM_DESTROY: win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0);

1 0

Michael Stefaniuc : wordpad: Simplify code that happened to work by chance (PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 9e7135e00cde71324b75252aa966ed4d27ffe4d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7135e00cde71324b75252aa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:20:12 2015 +0100 wordpad: Simplify code that happened to work by chance (PVS-Studio). --- programs/wordpad/wordpad.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index ec813a7..f1a7ceb 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2482,55 +2482,50 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam ) MENUITEMINFOW mi; SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&selFrom, (LPARAM)&selTo); - EnableMenuItem(hMenu, ID_EDIT_COPY, MF_BYCOMMAND|(selFrom == selTo) ? MF_GRAYED : MF_ENABLED); - EnableMenuItem(hMenu, ID_EDIT_CUT, MF_BYCOMMAND|(selFrom == selTo) ? MF_GRAYED : MF_ENABLED); + EnableMenuItem(hMenu, ID_EDIT_COPY, (selFrom == selTo) ? MF_GRAYED : MF_ENABLED); + EnableMenuItem(hMenu, ID_EDIT_CUT, (selFrom == selTo) ? MF_GRAYED : MF_ENABLED); pf.cbSize = sizeof(PARAFORMAT); SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); CheckMenuItem(hMenu, ID_EDIT_READONLY, - MF_BYCOMMAND|(GetWindowLongW(hwndEditor, GWL_STYLE)&ES_READONLY ? MF_CHECKED : MF_UNCHECKED)); + (GetWindowLongW(hwndEditor, GWL_STYLE) & ES_READONLY) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, ID_EDIT_MODIFIED, - MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_GETMODIFY, 0, 0) ? MF_CHECKED : MF_UNCHECKED)); + SendMessageW(hwndEditor, EM_GETMODIFY, 0, 0) ? MF_CHECKED : MF_UNCHECKED); if (pf.dwMask & PFM_ALIGNMENT) nAlignment = pf.wAlignment; - CheckMenuItem(hMenu, ID_ALIGN_LEFT, MF_BYCOMMAND|(nAlignment == PFA_LEFT) ? - MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_ALIGN_CENTER, MF_BYCOMMAND|(nAlignment == PFA_CENTER) ? - MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_ALIGN_RIGHT, MF_BYCOMMAND|(nAlignment == PFA_RIGHT) ? - MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_BULLET, MF_BYCOMMAND | ((pf.wNumbering == PFN_BULLET) ? - MF_CHECKED : MF_UNCHECKED)); - EnableMenuItem(hMenu, ID_EDIT_UNDO, MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_CANUNDO, 0, 0)) ? + CheckMenuItem(hMenu, ID_ALIGN_LEFT, (nAlignment == PFA_LEFT) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_ALIGN_CENTER, (nAlignment == PFA_CENTER) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_ALIGN_RIGHT, (nAlignment == PFA_RIGHT) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_BULLET, ((pf.wNumbering == PFN_BULLET) ? MF_CHECKED : MF_UNCHECKED)); + EnableMenuItem(hMenu, ID_EDIT_UNDO, SendMessageW(hwndEditor, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); - EnableMenuItem(hMenu, ID_EDIT_REDO, MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_CANREDO, 0, 0)) ? + EnableMenuItem(hMenu, ID_EDIT_REDO, SendMessageW(hwndEditor, EM_CANREDO, 0, 0) ? MF_ENABLED : MF_GRAYED); - CheckMenuItem(hMenu, ID_TOGGLE_TOOLBAR, MF_BYCOMMAND|(is_bar_visible(BANDID_TOOLBAR)) ? + CheckMenuItem(hMenu, ID_TOGGLE_TOOLBAR, is_bar_visible(BANDID_TOOLBAR) ? MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_TOGGLE_FORMATBAR, MF_BYCOMMAND|(is_bar_visible(BANDID_FORMATBAR)) ? + CheckMenuItem(hMenu, ID_TOGGLE_FORMATBAR, is_bar_visible(BANDID_FORMATBAR) ? MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, MF_BYCOMMAND|IsWindowVisible(hwndStatus) ? + CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, IsWindowVisible(hwndStatus) ? MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_TOGGLE_RULER, MF_BYCOMMAND|(is_bar_visible(BANDID_RULER)) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_TOGGLE_RULER, is_bar_visible(BANDID_RULER) ? MF_CHECKED : MF_UNCHECKED); gt.flags = GTL_NUMCHARS; gt.codepage = 1200; textLength = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); - EnableMenuItem(hMenu, ID_FIND, MF_BYCOMMAND|(textLength ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(hMenu, ID_FIND, textLength ? MF_ENABLED : MF_GRAYED); mi.cbSize = sizeof(mi); mi.fMask = MIIM_DATA; GetMenuItemInfoW(hMenu, ID_FIND_NEXT, FALSE, &mi); - EnableMenuItem(hMenu, ID_FIND_NEXT, MF_BYCOMMAND|((textLength && mi.dwItemData) ? - MF_ENABLED : MF_GRAYED)); + EnableMenuItem(hMenu, ID_FIND_NEXT, (textLength && mi.dwItemData) ? MF_ENABLED : MF_GRAYED); - EnableMenuItem(hMenu, ID_REPLACE, MF_BYCOMMAND|(textLength ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(hMenu, ID_REPLACE, textLength ? MF_ENABLED : MF_GRAYED); return 0; }

1 0

Michael Stefaniuc : ieframe/tests: Merge adjacent identical if's ( PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 8a755f37d8949375997c21cd9d7789de412f1536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a755f37d8949375997c21cd9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:21:07 2015 +0100 ieframe/tests: Merge adjacent identical if's (PVS-Studio). --- dlls/ieframe/tests/webbrowser.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index d86faf8..3dae2b6 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2684,9 +2684,11 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) SET_EXPECT(GetOptionKeyPath); SET_EXPECT(GetOverridesKeyPath); } - if (use_container_olecmd) SET_EXPECT(QueryStatus_SETPROGRESSTEXT); - if (use_container_olecmd) SET_EXPECT(Exec_SETPROGRESSMAX); - if (use_container_olecmd) SET_EXPECT(Exec_SETPROGRESSPOS); + if (use_container_olecmd) { + SET_EXPECT(QueryStatus_SETPROGRESSTEXT); + SET_EXPECT(Exec_SETPROGRESSMAX); + SET_EXPECT(Exec_SETPROGRESSPOS); + } SET_EXPECT(Invoke_SETSECURELOCKICON); SET_EXPECT(Invoke_FILEDOWNLOAD); if (use_container_olecmd) SET_EXPECT(Exec_SETDOWNLOADSTATE_0); @@ -2725,9 +2727,11 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) CLEAR_CALLED(GetOptionKeyPath); CHECK_CALLED(GetOverridesKeyPath); } - if (use_container_olecmd) todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); - if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); - if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); + if (use_container_olecmd) { + todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); + todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); + todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); + } todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); todo_wine CHECK_CALLED(Invoke_FILEDOWNLOAD);

1 0

Francois Gouget : ole32: Don't define NONAMELESSUNION in olestd.h. It' s not needed anyway.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: fb908b3a956b8e064c54d73db690b2d5deae4d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb908b3a956b8e064c54d73db… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 5 17:01:54 2015 +0100 ole32: Don't define NONAMELESSUNION in olestd.h. It's not needed anyway. --- dlls/ole32/olestd.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ole32/olestd.h b/dlls/ole32/olestd.h index 02a4d3b..fbc4442 100644 --- a/dlls/ole32/olestd.h +++ b/dlls/ole32/olestd.h @@ -19,10 +19,6 @@ #if !defined( __WINE_OLESTD_H_ ) #define __WINE_OLESTD_H_ -#if !defined(__cplusplus) && !defined( __TURBOC__) -#define NONAMELESSUNION /* use strict ANSI standard (for DVOBJ.H) */ -#endif - /* Clipboard format strings */ #define CF_EMBEDSOURCE "Embed Source" #define CF_EMBEDDEDOBJECT "Embedded Object"

1 0

Francois Gouget : d3dx9_36: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: f572279576b0016ca1d1ff2849ff9330da6cbbf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f572279576b0016ca1d1ff284… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 5 17:30:29 2015 +0100 d3dx9_36: Remove unneeded NONAMELESSXXX directives. --- dlls/d3dx9_36/shader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c66936d..cdc470b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -21,8 +21,6 @@ #include "config.h" #include "wine/port.h" -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "wine/debug.h" #include "wine/unicode.h" #include "windef.h"

1 0