November 2014 - Wine-commits

André Hentschel : crypt32/tests: Comment out an unused struct (Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 86c1d068f2903eb60d897d53419ea1b1ec462cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c1d068f2903eb60d897d534… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:59:11 2014 +0100 crypt32/tests: Comment out an unused struct (Clang). --- dlls/crypt32/tests/base64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 8f19515..c6073aa 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -57,7 +57,7 @@ struct BinTests static const BYTE toEncode1[] = { 0 }; static const BYTE toEncode2[] = { 1,2 }; -static const BYTE toEncode3[] = { 1,2,3 }; +/* static const BYTE toEncode3[] = { 1,2,3 }; */ static const BYTE toEncode4[] = "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890" "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890"

1 0

André Hentschel : advapi32: Remove unused strings ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 6eae6955b2be11f6db8d05b1927dc00e6e5f2a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eae6955b2be11f6db8d05b19… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:59:10 2014 +0100 advapi32: Remove unused strings (Clang). --- dlls/advapi32/security.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index cc20033..097b0da 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -187,7 +187,6 @@ static const WCHAR CREATOR_OWNER_SERVER[] = { 'C','R','E','A','T','O','R',' ','O static const WCHAR CURRENT_USER[] = { 'C','U','R','R','E','N','T','_','U','S','E','R',0 }; static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','i','n','s',0 }; static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; @@ -324,12 +323,8 @@ static const WCHAR SDDL_AUTO_INHERITED[] = {'A','I',0}; */ static const WCHAR SDDL_ACCESS_ALLOWED[] = {'A',0}; static const WCHAR SDDL_ACCESS_DENIED[] = {'D',0}; -static const WCHAR SDDL_OBJECT_ACCESS_ALLOWED[] = {'O','A',0}; -static const WCHAR SDDL_OBJECT_ACCESS_DENIED[] = {'O','D',0}; static const WCHAR SDDL_AUDIT[] = {'A','U',0}; static const WCHAR SDDL_ALARM[] = {'A','L',0}; -static const WCHAR SDDL_OBJECT_AUDIT[] = {'O','U',0}; -static const WCHAR SDDL_OBJECT_ALARMp[] = {'O','L',0}; /* * ACE flags

1 0

André Hentschel : winecfg: Remove unused strings ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: aa59d5b7bc3059d18e34149388bfb67c37da7495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa59d5b7bc3059d18e3414938… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:39 2014 +0100 winecfg: Remove unused strings (Clang). --- programs/winecfg/x11drvdlg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 8d914ad..809068e 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -51,8 +51,6 @@ static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; static const WCHAR explorerW[] = {'E','x','p','l','o','r','e','r',0}; static const WCHAR explorer_desktopsW[] = {'E','x','p','l','o','r','e','r','\\', 'D','e','s','k','t','o','p','s',0}; -static const WCHAR x11_driverW[] = {'X','1','1',' ','D','r','i','v','e','r',0}; -static const WCHAR default_resW[] = {'8','0','0','x','6','0','0',0}; static BOOL updating_ui;

1 0

André Hentschel : gdi32: Remove unused function ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: d83ae0ef40f047ee6748d3312c9c88979123944e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83ae0ef40f047ee6748d3312… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:58 2014 +0100 gdi32: Remove unused function (Clang). --- dlls/gdi32/font.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d9bb43a..8f52053 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -81,16 +81,6 @@ static inline INT height_to_LP( DC *dc, INT height ) return GDI_ROUND( (double)height * fabs( dc->xformVport2World.eM22 )); } -static inline INT INTERNAL_XWSTODS(DC *dc, INT width) -{ - POINT pt[2]; - pt[0].x = pt[0].y = 0; - pt[1].x = width; - pt[1].y = 0; - LPtoDP(dc->hSelf, pt, 2); - return pt[1].x - pt[0].x; -} - static inline INT INTERNAL_YWSTODS(DC *dc, INT height) { POINT pt[2];

1 0

André Hentschel : d3dx9_36/tests: Remove unused functions (Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 67ee1faba25ff943e221f426188f321ccc91e13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ee1faba25ff943e221f4261… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:59:13 2014 +0100 d3dx9_36/tests: Remove unused functions (Clang). --- dlls/d3dx9_36/tests/surface.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 4490dc3..5846281 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -30,13 +30,6 @@ static inline int get_ref(IUnknown *obj) return IUnknown_Release(obj); } -#define check_ref(obj, exp) _check_ref(__LINE__, obj, exp) -static inline void _check_ref(unsigned int line, IUnknown *obj, int exp) -{ - int ref = get_ref(obj); - ok_(__FILE__, line)(exp == ref, "Invalid refcount. Expected %d, got %d\n", exp, ref); -} - #define check_release(obj, exp) _check_release(__LINE__, obj, exp) static inline void _check_release(unsigned int line, IUnknown *obj, int exp) { @@ -608,13 +601,6 @@ static void test_D3DXGetImageInfo(void) if(testbitmap_ok) DeleteFileA("testbitmap.bmp"); } -#define check_pixel_1bpp(lockrect, x, y, color) _check_pixel_1bpp(__LINE__, lockrect, x, y, color) -static inline void _check_pixel_1bpp(unsigned int line, const D3DLOCKED_RECT *lockrect, int x, int y, BYTE expected_color) -{ - BYTE color = ((BYTE*)lockrect->pBits)[x + y * lockrect->Pitch]; - ok_(__FILE__, line)(color == expected_color, "Got color 0x%02x, expected 0x%02x\n", color, expected_color); -} - #define check_pixel_2bpp(lockrect, x, y, color) _check_pixel_2bpp(__LINE__, lockrect, x, y, color) static inline void _check_pixel_2bpp(unsigned int line, const D3DLOCKED_RECT *lockrect, int x, int y, WORD expected_color) {

1 0

André Hentschel : winedbg: Declare debug channel only when needed in be_x86_64 (Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 9988e2d685ec0e95093e0a306c2009e312e683d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9988e2d685ec0e95093e0a306… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 21:30:12 2014 +0100 winedbg: Declare debug channel only when needed in be_x86_64 (Clang). --- programs/winedbg/be_x86_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 8628025..029f9f1 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -22,10 +22,10 @@ #include "debugger.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(winedbg); - #if defined(__x86_64__) +WINE_DEFAULT_DEBUG_CHANNEL(winedbg); + #define STEP_FLAG 0x00000100 /* single step flag */ static BOOL be_x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx,

1 0

André Hentschel : ieframe/tests: Remove unused string (Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 9b506e6a86edbb6999ddb57e595c289ae8f66866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b506e6a86edbb6999ddb57e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:37 2014 +0100 ieframe/tests: Remove unused string (Clang). --- dlls/ieframe/tests/webbrowser.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 9a2edc3..7f45182 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -147,7 +147,6 @@ DEFINE_EXPECT(OnFocus); DEFINE_EXPECT(GetExternal); static const WCHAR wszItem[] = {'i','t','e','m',0}; -static const WCHAR emptyW[] = {0}; static VARIANT_BOOL exvb;

1 0

André Hentschel : control: Remove unused string ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 07b276e07e43a2b10307b79ad600c35bd810c6dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b276e07e43a2b10307b79ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:39 2014 +0100 control: Remove unused string (Clang). --- programs/control/control.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/control/control.c b/programs/control/control.c index 49f006c..9f9005f 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -40,7 +40,6 @@ static const WCHAR szP_PRINTERS [] = {'P','R','I','N','T','E','R','S',0}; static const WCHAR szC_COLOR[] = {'d','e','s','k','.','c','p','l',',',',','2',0}; static const WCHAR szC_DATETIME[] = {'t','i','m','e','d','a','t','e','.','c','p','l',0}; static const WCHAR szC_DESKTOP[] = {'d','e','s','k','.','c','p','l',0}; -static const WCHAR szC_FONTS[] = {'m','a','i','n','.','c','p','l',' ','@','3',0}; static const WCHAR szC_INTERNATIONAL[] = {'i','n','t','l','.','c','p','l',0}; static const WCHAR szC_KEYBOARD[] = {'m','a','i','n','.','c','p','l',' ','@','1',0}; static const WCHAR szC_MOUSE[] = {'m','a','i','n','.','c','p','l',0};

1 0

André Hentschel : jscript: Remove unused code (Clang) .
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: dec5bbbec4eb502b6893fb7d97cb1a2faffd0a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec5bbbec4eb502b6893fb7d9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:38 2014 +0100 jscript: Remove unused code (Clang). --- dlls/jscript/engine.c | 5 ----- dlls/jscript/jsregexp.c | 2 -- 2 files changed, 7 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9c6acb3..de60755 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -398,11 +398,6 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name return hres; } -static inline BOOL var_is_null(const VARIANT *v) -{ - return V_VT(v) == VT_NULL || (V_VT(v) == VT_DISPATCH && !V_DISPATCH(v)); -} - static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) { IObjectIdentity *identity; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index d6602f4..c39e3a1 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -58,8 +58,6 @@ static const WCHAR idx7W[] = {'$','7',0}; static const WCHAR idx8W[] = {'$','8',0}; static const WCHAR idx9W[] = {'$','9',0}; -static const WCHAR emptyW[] = {0}; - static inline RegExpInstance *regexp_from_vdisp(vdisp_t *vdisp) { return (RegExpInstance*)vdisp->u.jsdisp;

1 0

André Hentschel : dinput: Remove unused functions ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: c440168e53523c6132c1a4e855466af0fed2f653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c440168e53523c6132c1a4e85… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:55 2014 +0100 dinput: Remove unused functions (Clang). --- dlls/dinput/dinput_main.c | 4 ---- dlls/dinput/joystick_linux.c | 5 +---- dlls/dinput/joystick_linuxinput.c | 5 +---- dlls/dinput/mouse.c | 5 +---- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 14d5285..18840b2 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -79,10 +79,6 @@ static inline IDirectInputImpl *impl_from_IDirectInput8W( IDirectInput8W *iface return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8W_iface ); } -static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) -{ - return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8A_iface); -} static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 4d40124..697dded 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -107,10 +107,7 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W return CONTAINING_RECORD(CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base), JoystickImpl, generic); } -static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(JoystickImpl *This) -{ - return &This->generic.base.IDirectInputDevice8A_iface; -} + static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) { return &This->generic.base.IDirectInputDevice8W_iface; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 76adabc..4b4d69c 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -143,10 +143,7 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W return CONTAINING_RECORD(CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base), JoystickImpl, generic); } -static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(JoystickImpl *This) -{ - return &This->generic.base.IDirectInputDevice8A_iface; -} + static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) { return &This->generic.base.IDirectInputDevice8W_iface; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 03fc0b0..132efce 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -85,10 +85,7 @@ static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysMouseImpl, base); } -static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(SysMouseImpl *This) -{ - return &This->base.IDirectInputDevice8A_iface; -} + static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl *This) { return &This->base.IDirectInputDevice8W_iface;

1 0