wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Stefan Leichter : difxapi: Add stubs for SetDifxLogCallbackA/W.
by Alexandre Julliard 26 Nov '14

26 Nov '14

Module: wine Branch: master Commit: 791d4f9f8c3a748295774c6c7c4ddb8f20892be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791d4f9f8c3a748295774c6c7… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Nov 25 22:07:03 2014 +0100 difxapi: Add stubs for SetDifxLogCallbackA/W. --- dlls/difxapi/difxapi.spec | 2 ++ dlls/difxapi/main.c | 10 ++++++++++ include/difxapi.h | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index 33a805b..3e2f859 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -8,3 +8,5 @@ @ stdcall DriverPackagePreinstallW(wstr long) @ stdcall DriverPackageUninstallA(str long ptr ptr) @ stdcall DriverPackageUninstallW(wstr long ptr ptr) +@ stdcall SetDifxLogCallbackA(ptr ptr) +@ stdcall SetDifxLogCallbackW(ptr ptr) diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index 8a2679c..7b7b1d6 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -86,3 +86,13 @@ VOID WINAPI DIFXAPISetLogCallbackW(DIFXAPILOGCALLBACK_W cb, VOID *ctx) { FIXME("(%p, %p) stub\n", cb, ctx); } + +VOID WINAPI SetDifxLogCallbackA(DIFXLOGCALLBACK_A cb, VOID *ctx) +{ + FIXME("(%p, %p) stub\n", cb, ctx); +} + +VOID WINAPI SetDifxLogCallbackW(DIFXLOGCALLBACK_W cb, VOID *ctx) +{ + FIXME("(%p, %p) stub\n", cb, ctx); +} diff --git a/include/difxapi.h b/include/difxapi.h index f5149b8..21d43c9 100644 --- a/include/difxapi.h +++ b/include/difxapi.h @@ -51,6 +51,8 @@ typedef enum _DIFXAPI_LOG typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_A)(DIFXAPI_LOG,DWORD,PCSTR,PVOID); typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_W)(DIFXAPI_LOG,DWORD,PCWSTR,PVOID); +typedef VOID (CALLBACK *DIFXLOGCALLBACK_A)(DIFXAPI_LOG,DWORD,PCSTR,PVOID); +typedef VOID (CALLBACK *DIFXLOGCALLBACK_W)(DIFXAPI_LOG,DWORD,PCWSTR,PVOID); VOID WINAPI DIFXAPISetLogCallbackA(DIFXAPILOGCALLBACK_A,VOID*); VOID WINAPI DIFXAPISetLogCallbackW(DIFXAPILOGCALLBACK_W,VOID*); @@ -62,6 +64,8 @@ DWORD WINAPI DriverPackagePreinstallA(PCSTR,DWORD); DWORD WINAPI DriverPackagePreinstallW(PCWSTR,DWORD); DWORD WINAPI DriverPackageUninstallA(PCSTR,DWORD,PCINSTALLERINFO_A,BOOL*); DWORD WINAPI DriverPackageUninstallW(PCWSTR,DWORD,PCINSTALLERINFO_W,BOOL*); +VOID WINAPI SetDifxLogCallbackA(DIFXLOGCALLBACK_A,VOID*); +VOID WINAPI SetDifxLogCallbackW(DIFXLOGCALLBACK_W,VOID*); #ifdef __cplusplus }

1 0

Jacek Caban : mshtml/tests: Fixed some test failures.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 53d2778f97f865da6978b87d13ce74936f5064ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d2778f97f865da6978b87d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 25 13:22:44 2014 +0100 mshtml/tests: Fixed some test failures. --- dlls/mshtml/tests/htmldoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 84b8806..ace3128 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2988,6 +2988,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 144: /* TODO */ case 178: case 179: + case 180: + case 181: + case 182: return E_NOTIMPL; default:

1 0

Stefan Dösinger : d3d9/tests: Fix test_cursor().
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: abf44708a4ac016b86bd0ed747cf8c88dc3f7eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf44708a4ac016b86bd0ed74… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 25 10:16:53 2014 +0100 d3d9/tests: Fix test_cursor(). --- dlls/d3d9/tests/device.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 061846b..04bdf41 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1571,15 +1571,20 @@ static void test_cursor(void) HCURSOR cur; HWND window; HRESULT hr; + BOOL ret; + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + ret = SetCursorPos(50, 50); + ok(ret, "Failed to set cursor position.\n"); + flush_events(); memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); cur = info.hCursor; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); - ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -1623,12 +1628,11 @@ static void test_cursor(void) hr = IDirect3DDevice9_ShowCursor(device, TRUE); ok(hr == TRUE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); - /* GDI cursor unchanged */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d8/tests: Fix test_cursor().
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 4e8da470f850245a1b2bbac850b8ee59e135c560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8da470f850245a1b2bbac85… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 21 18:32:30 2014 +0100 d3d8/tests: Fix test_cursor(). --- dlls/d3d8/tests/device.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c8f9713..99fe70a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -759,6 +759,7 @@ static void test_cursor(void) HCURSOR cur; HWND window; HRESULT hr; + BOOL ret; pGetCursorInfo = (void *)GetProcAddress(user32_handle, "GetCursorInfo"); if (!pGetCursorInfo) @@ -767,14 +768,19 @@ static void test_cursor(void) return; } + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + + ret = SetCursorPos(50, 50); + ok(ret, "Failed to set cursor position.\n"); + flush_events(); + memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); cur = info.hCursor; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); - ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -817,12 +823,11 @@ static void test_cursor(void) hr = IDirect3DDevice8_ShowCursor(device, TRUE); ok(hr == TRUE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr); - /* GDI cursor unchanged */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

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

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 : 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 : 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 : 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 : 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

← Newer
1
2
3
4
5
6
7
8
9
...
40
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 November 2014