wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Sebastian Lackner : oleaut32/tests: Add test for calling method with coclass argument.
by Alexandre Julliard 03 Dec '15

03 Dec '15

Module: wine Branch: master Commit: 3690fa04015174de9b015eaa5a5c584c29070eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3690fa04015174de9b015eaa5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 3 00:49:35 2015 +0100 oleaut32/tests: Add test for calling method with coclass argument. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 29 ++++++++++++++++++++++++++--- dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4a990af..d2b8dc9 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -598,7 +598,7 @@ static HRESULT WINAPI Widget_CloneCoclass( ApplicationObject2 **ppVal) { trace("CloneCoclass()\n"); - return S_OK; + return Widget_QueryInterface(iface, &IID_IWidget, (void **)ppVal); } static HRESULT WINAPI Widget_Value( @@ -909,6 +909,14 @@ static HRESULT WINAPI Widget_VarArg_Ref_Run( return S_OK; } +static HRESULT WINAPI Widget_Coclass( + IWidget *iface, ApplicationObject2 *param) +{ + trace("Coclass(%p)\n", param); + ok(param == (ApplicationObject2 *)iface, "expected param == %p, got %p\n", iface, param); + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -948,7 +956,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_pos_restrict, Widget_neg_restrict, Widget_VarArg_Run, - Widget_VarArg_Ref_Run + Widget_VarArg_Ref_Run, + Widget_Coclass, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1494,8 +1503,22 @@ static void test_typelibmarshal(void) excepinfo.wCode, excepinfo.scode); ok(V_VT(&varresult) == VT_DISPATCH, "V_VT(&varresult) was %d instead of VT_DISPATCH\n", V_VT(&varresult)); - ok(!V_DISPATCH(&varresult), "V_DISPATCH(&varresult) should be NULL instead of %p\n", V_DISPATCH(&varresult)); + ok(V_DISPATCH(&varresult) != NULL, "expected V_DISPATCH(&varresult) != NULL\n"); + + /* call Coclass with VT_DISPATCH type */ + vararg[0] = varresult; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 1; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + todo_wine ok_ole_success(hr, IDispatch_Invoke); + ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, + "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", + excepinfo.wCode, excepinfo.scode); VariantClear(&varresult); + VariantClear(&vararg[0]); /* call Value with a VT_VARIANT|VT_BYREF type */ V_VT(&vararg[0]) = VT_VARIANT|VT_BYREF; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 680f4b4..12c0bd5 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -185,6 +185,9 @@ library TestTypelib [id(DISPID_TM_VARARG_REF_RUN), vararg] HRESULT VarArg_Ref_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) *params, [out, retval] VARIANT *result); + + [id(DISPID_TM_COCLASS)] + HRESULT Coclass([in] ApplicationObject2 *param); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index dfca216..26f4027 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -46,6 +46,7 @@ #define DISPID_TM_TESTSECONDIFACE 27 #define DISPID_TM_VARARG_RUN 28 #define DISPID_TM_VARARG_REF_RUN 29 +#define DISPID_TM_COCLASS 30 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2

1 0

Michael Müller : winedbg: Print windows version in system info.
by Alexandre Julliard 03 Dec '15

03 Dec '15

Module: wine Branch: master Commit: a78efe16f7b0ca9475d153d98f4c2053cde0ca62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78efe16f7b0ca9475d153d98… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Dec 3 00:20:25 2015 +0100 winedbg: Print windows version in system info. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/tgt_active.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 989e433..07edccc 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -678,6 +678,63 @@ static HANDLE create_temp_file(void) NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0 ); } +static const struct +{ + int type; + int platform; + int major; + int minor; + const char *str; +} +version_table[] = +{ + { 0, VER_PLATFORM_WIN32s, 2, 0, "2.0" }, + { 0, VER_PLATFORM_WIN32s, 3, 0, "3.0" }, + { 0, VER_PLATFORM_WIN32s, 3, 10, "3.1" }, + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 0, "95" }, + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 10, "98" }, + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 90, "ME" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 3, 51, "NT 3.51" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 4, 0, "NT 4.0" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 0, "2000" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 1, "XP" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 2, "XP" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 5, 2, "Server 2003" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 0, "Vista" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 0, "Server 2008" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 1, "7" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 1, "Server 2008 R2" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 2, "8" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 2, "Server 2012" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 3, "8.1" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 3, "Server 2012 R2" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 10, 0, "10" }, +}; + +static const char *get_windows_version(void) +{ + OSVERSIONINFOEXW info = { sizeof(OSVERSIONINFOEXW) }; + static char str[64]; + int i; + + GetVersionExW( (OSVERSIONINFOW *)&info ); + + for (i = 0; i < sizeof(version_table) / sizeof(version_table[0]); i++) + { + if (version_table[i].type == info.wProductType && + version_table[i].platform == info.dwPlatformId && + version_table[i].major == info.dwMajorVersion && + version_table[i].minor == info.dwMinorVersion) + { + return version_table[i].str; + } + } + + snprintf( str, sizeof(str), "%d.%d (%d)", info.dwMajorVersion, + info.dwMinorVersion, info.wProductType ); + return str; +} + static void output_system_info(void) { #ifdef __i386__ @@ -705,6 +762,7 @@ static void output_system_info(void) dbg_printf( "System information:\n" ); if (wine_get_build_id) dbg_printf( " Wine build: %s\n", wine_get_build_id() ); dbg_printf( " Platform: %s%s\n", platform, is_wow64 ? " (WOW64)" : "" ); + dbg_printf( " Version: Windows %s\n", get_windows_version() ); if (wine_get_host_version) { const char *sysname, *release;

1 0

Michael Stefaniuc : dsound: A version 1 3d secondary buffer allows SetPan( ).
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: e69d9ec3c4e8829c5c18cea7d8348171d51dcd76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69d9ec3c4e8829c5c18cea7d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 1 14:49:04 2015 +0100 dsound: A version 1 3d secondary buffer allows SetPan(). For version 8 DSBCAPS_CTRL3D and DSBCAPS_CTRLPAN are mutually exclusive and a sound buffer cannot be created when both flags are set. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 4 +--- dlls/dsound/tests/ds3d.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index d735dc3..5aa2834 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -586,9 +586,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(IDirectSoundBuffer8 *iface, return DSERR_INVALIDPARAM; } - /* You cannot use both pan and 3D controls */ - if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN) || - (This->dsbd.dwFlags & DSBCAPS_CTRL3D)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 1a019dd..6c12f71 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -892,7 +892,6 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, rc=IDirectSoundBuffer_GetPan(secondary,&pan); ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed, returned: %08x\n", rc); rc=IDirectSoundBuffer_SetPan(secondary,0); - todo_wine ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed, returned: %08x\n", rc); }

1 0

Michael Stefaniuc : dsound/tests: Test Pan for 3D secondary buffers too.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: 25d23d44327163b09448cfaaf8def01507cb8508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d23d44327163b09448cfaaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 1 14:48:43 2015 +0100 dsound/tests: Test Pan for 3D secondary buffers too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/ds3d.c | 9 +++++++++ dlls/dsound/tests/ds3d8.c | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 0e0d26f..1a019dd 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -886,7 +886,16 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); rc=IDirectSoundBuffer_SetPan(secondary,0); ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + } else if (has_3dbuffer) { + LONG pan; + + rc=IDirectSoundBuffer_GetPan(secondary,&pan); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed, returned: %08x\n", rc); + rc=IDirectSoundBuffer_SetPan(secondary,0); + todo_wine + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed, returned: %08x\n", rc); } + if (has_duplicate) { LPDIRECTSOUNDBUFFER duplicated=NULL; diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index b18a91f..330f590 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -730,7 +730,17 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); rc=IDirectSoundBuffer_SetPan(secondary,0); ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + } else { + LONG pan; + + rc=IDirectSoundBuffer_GetPan(secondary,&pan); + ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetPan() " + "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + rc=IDirectSoundBuffer_SetPan(secondary,0); + ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_SetPan() " + "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); } + if (has_duplicate) { LPDIRECTSOUNDBUFFER duplicated=NULL;

1 0

Michael Stefaniuc : dsound/tests: Version differences in flag handling for 3d buffers.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: 72d67a2d4eebbd88bd4c23fa4c053a7c7d0ec3cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d67a2d4eebbd88bd4c23fa4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 1 14:47:42 2015 +0100 dsound/tests: Version differences in flag handling for 3d buffers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/ds3d.c | 4 +--- dlls/dsound/tests/ds3d8.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index dffd409..0e0d26f 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -805,9 +805,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; if (has_3dbuffer) bufdesc.dwFlags|=DSBCAPS_CTRL3D; - else - bufdesc.dwFlags|= - (DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN); + bufdesc.dwFlags|= DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN; bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index f0d7d77..b18a91f 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -649,12 +649,16 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer(secondary) should have " "returned DSERR_INVALIDPARAM, returned %08x\n", rc); - if (secondary) - { - ref=IDirectSoundBuffer_Release(secondary); - ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, should have 0\n",ref); - } init_format(&wfx,WAVE_FORMAT_PCM,22050,16,1); + + /* Invalid flag combination */ + bufdesc.dwFlags|=DSBCAPS_CTRLPAN; + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + todo_wine + ok(rc==DSERR_INVALIDPARAM, + "IDirectSound8_CreateSoundBuffer(secondary) should have " + "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + bufdesc.dwFlags&=~DSBCAPS_CTRLPAN; } if (winetest_interactive) {

1 0

Alexandre Julliard : user32/tests: Also ignore WM_SYSTIMER messages in input tests.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: c92ba78899d7c57804823b0971da7a3bc825550f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92ba78899d7c57804823b097… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 22:14:39 2015 +0900 user32/tests: Also ignore WM_SYSTIMER messages in input tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 251f9ee..30b3da9 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -39,6 +39,10 @@ #define SPI_GETDESKWALLPAPER 0x0073 #endif +#ifndef WM_SYSTIMER +#define WM_SYSTIMER 0x0118 +#endif + #define LONG_PTR INT_PTR #define ULONG_PTR UINT_PTR @@ -183,6 +187,8 @@ static BOOL ignore_message( UINT message ) return (message >= 0xc000 || message == WM_GETICON || message == WM_GETOBJECT || + message == WM_TIMER || + message == WM_SYSTIMER || message == WM_TIMECHANGE || message == WM_DEVICECHANGE); } @@ -3435,7 +3441,7 @@ static BOOL peek_message( MSG *msg ) do { ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); - } while (ret && (msg->message == WM_TIMER || ignore_message(msg->message))); + } while (ret && ignore_message(msg->message)); return ret; } @@ -3599,7 +3605,7 @@ static void test_mouse_input(HWND hwnd) /* FIXME: SetCursorPos in Wine generates additional WM_MOUSEMOVE message */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { - if (msg.message == WM_TIMER || ignore_message(msg.message)) continue; + if (ignore_message(msg.message)) continue; ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); DispatchMessageA(&msg);

1 0

Alexandre Julliard : user32/tests: Maximized windows can be full-screen in recent Windows.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: 80193a6c68c4e5a3983a20f5c925bf33b58b7509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80193a6c68c4e5a3983a20f5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 17:26:53 2015 +0900 user32/tests: Maximized windows can be full-screen in recent Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fc6505f..251f9ee 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6841,11 +6841,11 @@ static void test_fullscreen(void) /* Windows makes a maximized window slightly larger (to hide the borders?) */ fixup = min(abs(rc.left), abs(rc.top)); InflateRect(&rc, -fixup, -fixup); - ok(rc.left >= mi.rcWork.left && rc.top <= mi.rcWork.top && - rc.right <= mi.rcWork.right && rc.bottom <= mi.rcWork.bottom, + ok(rc.left >= mi.rcMonitor.left && rc.top >= mi.rcMonitor.top && + rc.right <= mi.rcMonitor.right && rc.bottom <= mi.rcMonitor.bottom, "%#x/%#x: window rect %d,%d-%d,%d must be in %d,%d-%d,%d\n", ex_style, style, rc.left, rc.top, rc.right, rc.bottom, - mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); + mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); DestroyWindow(hwnd); style = t_style[i] | WS_MAXIMIZE | WS_MAXIMIZEBOX; @@ -6863,8 +6863,8 @@ static void test_fullscreen(void) rc.right >= mi.rcMonitor.right && rc.bottom >= mi.rcMonitor.bottom, "%#x/%#x: window rect %d,%d-%d,%d\n", ex_style, style, rc.left, rc.top, rc.right, rc.bottom); else - ok(rc.left >= mi.rcWork.left && rc.top <= mi.rcWork.top && - rc.right <= mi.rcWork.right && rc.bottom <= mi.rcWork.bottom, + ok(rc.left >= mi.rcMonitor.left && rc.top >= mi.rcMonitor.top && + rc.right <= mi.rcMonitor.right && rc.bottom <= mi.rcMonitor.bottom, "%#x/%#x: window rect %d,%d-%d,%d\n", ex_style, style, rc.left, rc.top, rc.right, rc.bottom); DestroyWindow(hwnd); }

1 0

Alexandre Julliard : ntdll/tests: Use more reasonable timeouts and avoid long long constants.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: 9cad1cc84762137a20caa53b5d7724c7fd03c686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cad1cc84762137a20caa53b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 17:09:08 2015 +0900 ntdll/tests: Use more reasonable timeouts and avoid long long constants. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 20d82f4..7c30408 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -126,7 +126,7 @@ static NTSTATUS create_pipe(PHANDLE handle, ULONG sharing, ULONG options) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - timeout.QuadPart = -100000000000ll; + timeout.QuadPart = -100000000; res = pNtCreateNamedPipeFile(handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, sharing, 2 /*FILE_CREATE*/, options, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); @@ -152,7 +152,7 @@ static void test_create_invalid(void) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - timeout.QuadPart = -100000000000ll; + timeout.QuadPart = -100000000; /* create a pipe with FILE_OVERWRITE */ res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ, 4 /*FILE_OVERWRITE*/, @@ -521,7 +521,7 @@ static void test_filepipeinfo(void) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - timeout.QuadPart = -100000000000ll; + timeout.QuadPart = -100000000; /* test with INVALID_HANDLE_VALUE */ res = pNtQueryInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23);

1 0

Alexandre Julliard : winex11: Include raw motion events in the QS_MOUSEMOVE event filter.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: 197f708be448719bf5938d1ff282811439e7c224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197f708be448719bf5938d1ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 15:31:34 2015 +0900 winex11: Include raw motion events in the QS_MOUSEMOVE event filter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index ee30259..51ef24b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -240,6 +240,9 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) case ButtonPress: case ButtonRelease: return (mask & QS_MOUSEBUTTON) != 0; +#ifdef GenericEvent + case GenericEvent: +#endif case MotionNotify: case EnterNotify: case LeaveNotify:

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Module: wine Branch: master Commit: 413c6f60cf89cd04ecfde0b3f26f239129cb5b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413c6f60cf89cd04ecfde0b3f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 2 01:42:31 2015 +0100 Assorted spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/dsound/duplex.c | 2 +- dlls/dxgi/tests/device.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/msrle32/tests/msrle.c | 2 +- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/shell32/shlfileop.c | 2 +- dlls/winepulse.drv/mmdevdrv.c | 10 +++++----- dlls/winspool.drv/info.c | 2 +- dlls/xaudio2_7/xaudio_dll.c | 2 +- programs/cmd/tests/test_builtins.cmd | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index d25600e..c13af50 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1474,7 +1474,7 @@ static void test_create_sampler_state(void) ok(d3d11_desc.Filter == expected_desc.Filter, "Test %u: Got unexpected filter %#x.\n", i, d3d11_desc.Filter); ok(d3d11_desc.AddressU == expected_desc.AddressU, - "Test %u: Got unexpected adress u %u.\n", i, d3d11_desc.AddressU); + "Test %u: Got unexpected address u %u.\n", i, d3d11_desc.AddressU); ok(d3d11_desc.AddressV == expected_desc.AddressV, "Test %u: Got unexpected address v %u.\n", i, d3d11_desc.AddressV); ok(d3d11_desc.AddressW == expected_desc.AddressW, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7021c6f..6c8f0f7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1917,7 +1917,7 @@ static void test_create_sampler_state(void) ok(d3d10_desc.Filter == expected_desc.Filter, "Test %u: Got unexpected filter %#x.\n", i, d3d10_desc.Filter); ok(d3d10_desc.AddressU == expected_desc.AddressU, - "Test %u: Got unexpected adress u %u.\n", i, d3d10_desc.AddressU); + "Test %u: Got unexpected address u %u.\n", i, d3d10_desc.AddressU); ok(d3d10_desc.AddressV == expected_desc.AddressV, "Test %u: Got unexpected address v %u.\n", i, d3d10_desc.AddressV); ok(d3d10_desc.AddressW == expected_desc.AddressW, diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index b18972e..153c7b6 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -67,7 +67,7 @@ static void fullduplex_destroy(IDirectSoundFullDuplexImpl *This) } /******************************************************************************* - * IUnknown implemetation for DirectSoundFullDuplex + * IUnknown implementation for DirectSoundFullDuplex */ static inline IDirectSoundFullDuplexImpl *impl_from_IUnknown(IUnknown *iface) { diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 4e54f4f..dd5da83 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1193,7 +1193,7 @@ static void test_swapchain_parameters(void) /* Buffers > 0 are supposed to be read only. This is the case except that in * fullscreen mode on Windows <= 8 the last backbuffer (BufferCount - 1) is - * writeable. This is not the case if an unsupported refresh rate is passed + * writable. This is not the case if an unsupported refresh rate is passed * for some reason, probably because the invalid refresh rate triggers a * kinda-sorta windowed mode. * diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5ed22c0..fbb558e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2653,7 +2653,7 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID DISPPARAMS dp = {args, NULL, 2, 0}; /* - * setTimeout calls shoud use default value 0 for the second argument if only one is provided, + * setTimeout calls should use default value 0 for the second argument if only one is provided, * but IDL file does not reflect that. We fixup arguments here instead. */ if(!(wFlags & DISPATCH_METHOD) || pdp->cArgs != 1 || pdp->cNamedArgs) diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 38e74a6..14ddddb 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -137,7 +137,7 @@ static void test_raw_decompress(void) hic = ICLocate(FCC('V', 'I', 'D', 'C'), codecs[i], bih, NULL, ICMODE_DECOMPRESS); ok(hic != NULL, "Test[%d]: Expected non-NULL return\n", i); - /* Now wich is this codec? Windows returns MRLE for uncompressed cases */ + /* Now which is this codec? Windows returns MRLE for uncompressed cases */ memset(&codec_info, 0, sizeof(codec_info)); hr = ICGetInfo(hic, &codec_info, sizeof(codec_info)); ok(hr == sizeof(codec_info), "Test[%d]: Incorrect amount of data returned\n", i); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index b3b0214..85383e8 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -776,7 +776,7 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB current = ILGetNext(current); }; - /* Build the path and compute the attributes*/ + /* Build the path and compute the attributes */ This->m_dwAttributes = dwAttributes|SFGAO_FOLDER|SFGAO_HASSUBFOLDER|SFGAO_FILESYSANCESTOR|SFGAO_CANRENAME; This->m_pszPath = pNextDir = SHAlloc(dwPathLen); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index c843dd7..234a141 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -572,7 +572,7 @@ DWORD WINAPI Win32DeleteFileAW(LPCVOID path) * dest [I] path to target file to move to * * RETURNS - * ERORR_SUCCESS if successful + * ERROR_SUCCESS if successful */ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) { diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 24972ab..0e6cf9f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -506,7 +506,7 @@ fail: return E_FAIL; } -/* For default Pulseaudio render device, OR together all of the +/* For default PulseAudio render device, OR together all of the * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { @@ -801,7 +801,7 @@ static HRESULT pulse_stream_connect(ACImpl *This, UINT32 period_bytes) { pa_stream_set_buffer_attr_callback(This->stream, pulse_attr_update, This); pa_stream_set_moved_callback(This->stream, pulse_attr_update, This); - /* Pulseaudio will fill in correct values */ + /* PulseAudio will fill in correct values */ attr.minreq = attr.fragsize = period_bytes; attr.maxlength = attr.tlength = This->bufsize_bytes; attr.prebuf = pa_frame_size(&This->ss); @@ -2991,7 +2991,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( if (context) FIXME("Notifications not supported yet\n"); - TRACE("Pulseaudio does not support session volume control\n"); + TRACE("PulseAudio does not support session volume control\n"); pthread_mutex_lock(&pulse_lock); session->master_vol = level; @@ -3127,7 +3127,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( if (context) FIXME("Notifications not supported yet\n"); - TRACE("Pulseaudio does not support session volume control\n"); + TRACE("PulseAudio does not support session volume control\n"); pthread_mutex_lock(&pulse_lock); session->channel_vols[index] = level; @@ -3175,7 +3175,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( if (context) FIXME("Notifications not supported yet\n"); - TRACE("Pulseaudio does not support session volume control\n"); + TRACE("PulseAudio does not support session volume control\n"); pthread_mutex_lock(&pulse_lock); for(i = 0; i < count; ++i) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ca2c34d..04def86 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -317,7 +317,7 @@ static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_win40 * * NOTES * An empty string is handled the same way as NULL. - * SetLastEror(ERROR_INVALID_ENVIRONMENT) is called on Failure + * SetLastError(ERROR_INVALID_ENVIRONMENT) is called on Failure * */ diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 73cf63d..04f975c 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2091,7 +2091,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return IClassFactory_QueryInterface(factory, riid, ppv); } -/* returns TRUE if there is more data avilable in the buffer, FALSE if the +/* returns TRUE if there is more data available in the buffer, FALSE if the * buffer's data has all been queued */ static BOOL xa2buffer_queue_period(XA2SourceImpl *src, XA2Buffer *buf, ALuint al_buf) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 52c549e..cf2559a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -973,7 +973,7 @@ del temp.bat 2>nul goto :eof :TestForR -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi echo --- for /R

1 0

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 December 2015