February 2015 - Wine-commits

André Hentschel : ole32: Remove unused macros.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 8af03fef9a298df6140a012466d0e8a76dcd0b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af03fef9a298df6140a01246… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:33 2015 +0100 ole32: Remove unused macros. --- dlls/ole32/clipboard.c | 2 -- dlls/ole32/filelockbytes.c | 4 ---- dlls/ole32/ole2impl.c | 2 -- 3 files changed, 8 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 38df750..d40ee59 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -83,8 +83,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define HANDLE_ERROR(err) do { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } while (0) - /* Structure of 'Ole Private Data' clipboard format */ typedef struct { diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 605b5df..7dc4843 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -65,10 +65,6 @@ static inline FileLockBytesImpl *impl_from_ILockBytes(ILockBytes *iface) * Prototypes for private methods */ -/* Note that this evaluates a and b multiple times, so don't - * pass expressions with side effects. */ -#define ROUND_UP(a, b) ((((a) + (b) - 1)/(b))*(b)) - /**************************************************************************** * GetProtectMode * diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 5d92fec..152132b 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define MAX_CLIPFORMAT_NAME 80 - /****************************************************************************** * OleQueryCreateFromData [OLE32.@] *

1 0

André Hentschel : strmbase: Remove unused macro.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 72eefcb5c0a9d9c19407a279afc5810116ae78b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72eefcb5c0a9d9c19407a279a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:31 2015 +0100 strmbase: Remove unused macro. --- dlls/strmbase/dllfunc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 61ec283..195a409 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -51,7 +51,6 @@ static LONG server_locks = 0; /* * defines and constants */ -#define MAX_KEY_LEN 260 static const WCHAR clsid_keyname[] = {'C','L','S','I','D',0 }; static const WCHAR ips32_keyname[] = {'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0};

1 0

André Hentschel : oleaut32: Remove unused macros.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: bedd444a3616fea54a060e07c27a137f29052fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedd444a3616fea54a060e07c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:35 2015 +0100 oleaut32: Remove unused macros. --- dlls/oleaut32/varformat.c | 2 -- dlls/oleaut32/vartype.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index ec52a1e..27bedce 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -284,8 +284,6 @@ typedef struct tagFMT_DATE_HEADER #define FMT_NUM_ON_OFF 0x3F /* Convert to "On" or "Off" */ #define FMT_STR_COPY_SPACE 0x40 /* Copy len chars with space if no char */ #define FMT_STR_COPY_SKIP 0x41 /* Copy len chars or skip if no char */ -/* Wine additions */ -#define FMT_WINE_HOURS_12 0x81 /* Hours using 12 hour clock */ /* Named Formats and their tokenised values */ static const WCHAR szGeneralDate[] = { 'G','e','n','e','r','a','l',' ','D','a','t','e','\0' }; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index e9b45ff..607d1a2 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4148,8 +4148,6 @@ HRESULT WINAPI VarDecFromI4(LONG lIn, DECIMAL* pDecOut) return S_OK; } -#define LOCALE_EN_US (MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT)) - /* internal representation of the value stored in a DECIMAL. The bytes are stored from LSB at index 0 to MSB at index 11 */

1 0

Michael Stefaniuc : oledlg: RT_DIALOG is already an int resource ( PVS-Studio).
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: b9d5074aaab1d874c329ef848d4522c225743baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d5074aaab1d874c329ef848… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:00:53 2015 +0100 oledlg: RT_DIALOG is already an int resource (PVS-Studio). --- dlls/oledlg/pastespl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index f136438..4d31488 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -711,7 +711,7 @@ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW ps) HRSRC hrsrc; if(name == NULL) return OLEUI_ERR_LPSZTEMPLATEINVALID; - hrsrc = FindResourceW(hInst, name, MAKEINTRESOURCEW(RT_DIALOG)); + hrsrc = FindResourceW(hInst, name, (LPWSTR)RT_DIALOG); if(!hrsrc) return OLEUI_ERR_FINDTEMPLATEFAILURE; dlg_templ = LoadResource(hInst, hrsrc); if(!dlg_templ) return OLEUI_ERR_LOADTEMPLATEFAILURE;

1 0

Michael Stefaniuc : setupapi: RT_MANIFEST is already an int resource ( PVS-Studio).
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: d0dfa75ba4983ff594407d6415f5c822adb2c46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0dfa75ba4983ff594407d641… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:01:52 2015 +0100 setupapi: RT_MANIFEST is already an int resource (PVS-Studio). --- dlls/setupapi/fakedll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8e3dffb..b543ade 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -791,7 +791,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size HMODULE module = (HMODULE)((ULONG_PTR)data | 1); HRSRC rsrc; - if ((rsrc = FindResourceW( module, manifestW, MAKEINTRESOURCEW(RT_MANIFEST) ))) + if ((rsrc = FindResourceW( module, manifestW, (LPWSTR)RT_MANIFEST ))) { char *manifest = LoadResource( module, rsrc ); register_manifest( name, manifest, SizeofResource( module, rsrc ), data, size );

1 0

Michael Stefaniuc : mshtml/tests: Remove an always true conditional subexpression (PVS-Studio).
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 9dc35ac468f9c6e805a0eb1c57d043cabfe87a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc35ac468f9c6e805a0eb1c5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:04:34 2015 +0100 mshtml/tests: Remove an always true conditional subexpression (PVS-Studio). --- dlls/mshtml/tests/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 64c0556..8f4e15e 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1412,7 +1412,7 @@ static void pump_msgs(BOOL *b) DispatchMessageW(&msg); } }else { - while(!b && PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { + while(PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); DispatchMessageW(&msg); }

1 0

Michael Stefaniuc : oleaut32/tests: Remove an always true conditional subexpression (PVS-Studio).
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 724ee1d4fcf5807c490e60c2a99926de6a2ce34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=724ee1d4fcf5807c490e60c2a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:06:16 2015 +0100 oleaut32/tests: Remove an always true conditional subexpression (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 7ed4fd4..cf9e101 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -7548,7 +7548,7 @@ static void test_VarDiv(void) } /* Determine return type */ - if (!(rightvt == VT_EMPTY)) + if (rightvt != VT_EMPTY) { if (leftvt == VT_NULL || rightvt == VT_NULL) resvt = VT_NULL; @@ -7577,7 +7577,7 @@ static void test_VarDiv(void) else if (leftvt == VT_R4 || rightvt == VT_R4) resvt = VT_R4; } - else if (leftvt == VT_NULL && rightvt == VT_EMPTY) + else if (leftvt == VT_NULL) resvt = VT_NULL; else bFail = TRUE;

1 0

Michael Stefaniuc : rsaenh: Remove an always false conditional subexpression (PVS-Studio).
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 17e565dbf91c3de8570d1581790aeb85aec5a971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e565dbf91c3de8570d15817… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:22:26 2015 +0100 rsaenh: Remove an always false conditional subexpression (PVS-Studio). --- dlls/rsaenh/mpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index e964676..f75d89f 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1955,8 +1955,8 @@ int mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y) dr = 0; - /* if the modulus is odd or dr != 0 use the fast method */ - if (mp_isodd (P) == 1 || dr != 0) { + /* if the modulus is odd use the fast method */ + if (mp_isodd (P) == 1) { return mp_exptmod_fast (G, X, P, Y, dr); } else { /* otherwise use the generic Barrett reduction technique */

1 0

Michael Stefaniuc : wcmd: Remove an unused variable (PVS-Studio).
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: b7c8b62bbf632fe26db0a19bfe40cb51ac69d0f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c8b62bbf632fe26db0a19bf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:23:01 2015 +0100 wcmd: Remove an unused variable (PVS-Studio). --- programs/cmd/wcmdmain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index e5865e6..bc9b216 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1046,7 +1046,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR pathext[MAXSTRING]; WCHAR *firstParam; BOOL extensionsupplied = FALSE; - BOOL launched = FALSE; BOOL status; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; @@ -1098,8 +1097,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) pathposn = pathtosearch; WINE_TRACE("Searching in '%s' for '%s'\n", wine_dbgstr_w(pathtosearch), wine_dbgstr_w(stemofsearch)); - while (!launched && pathposn) { - + while (pathposn) { WCHAR thisDir[MAX_PATH] = {'\0'}; WCHAR *pos = NULL; BOOL found = FALSE;

1 0

Michael Stefaniuc : appwiz.cpl: Use the proper type to hold the return value (PVS-Studio).
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: c3c272c4c5de5874f008271b78648394bb55fb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c272c4c5de5874f008271b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:23:29 2015 +0100 appwiz.cpl: Use the proper type to hold the return value (PVS-Studio). --- dlls/appwiz.cpl/addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3a7d35d..3704c56 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -307,7 +307,7 @@ static enum install_res install_from_default_dir(void) const char *data_dir, *package_dir; char *dir_buf = NULL; int len; - BOOL ret; + enum install_res ret; if((data_dir = wine_get_data_dir())) { package_dir = data_dir;

1 0