December 2015 - Wine-Commits

Jacek Caban : exdisp.idl: Added new DWebBrowserEvents2 members declarations.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: c7b85c893ef061ca4edb4efdc44b57151fe7eea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b85c893ef061ca4edb4efdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 18:24:21 2015 +0100 exdisp.idl: Added new DWebBrowserEvents2 members declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 12 ++++++------ include/exdisp.idl | 11 +++++++++++ include/exdispid.h | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1617dcb..3584647 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -114,7 +114,7 @@ DEFINE_EXPECT(Invoke_NAVIGATECOMPLETE2); DEFINE_EXPECT(Invoke_PROGRESSCHANGE); DEFINE_EXPECT(Invoke_DOCUMENTCOMPLETE); DEFINE_EXPECT(Invoke_WINDOWCLOSING); -DEFINE_EXPECT(Invoke_282); +DEFINE_EXPECT(Invoke_SETPHISHINGFILTERSTATUS); DEFINE_EXPECT(EnableModeless_TRUE); DEFINE_EXPECT(EnableModeless_FALSE); DEFINE_EXPECT(GetHostInfo); @@ -1017,11 +1017,11 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe return S_OK; } - case 282: /* FIXME */ - CHECK_EXPECT2(Invoke_282); + case DISPID_SETPHISHINGFILTERSTATUS: /* FIXME */ + CHECK_EXPECT2(Invoke_SETPHISHINGFILTERSTATUS); break; - case 290: /* FIXME: IE10 */ + case DISPID_BEFORESCRIPTEXECUTE: /* FIXME: IE10 */ break; default: @@ -2891,7 +2891,7 @@ static void test_download(DWORD flags) SET_EXPECT(DocHost_EnableModeless_FALSE); SET_EXPECT(DocHost_EnableModeless_TRUE); SET_EXPECT(Invoke_SETSECURELOCKICON); - SET_EXPECT(Invoke_282); + SET_EXPECT(Invoke_SETPHISHINGFILTERSTATUS); SET_EXPECT(EnableModeless_FALSE); if(!(flags & DWL_REFRESH)) { @@ -2960,7 +2960,7 @@ static void test_download(DWORD flags) CLEAR_CALLED(DocHost_EnableModeless_FALSE); /* IE 7 */ CLEAR_CALLED(DocHost_EnableModeless_TRUE); /* IE 7 */ todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); - CLEAR_CALLED(Invoke_282); /* IE 7 */ + CLEAR_CALLED(Invoke_SETPHISHINGFILTERSTATUS); /* IE 7 */ if(is_first_load) todo_wine CHECK_CALLED(EnableModeless_FALSE); else diff --git a/include/exdisp.idl b/include/exdisp.idl index 7b5d921..5ee9960 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -476,6 +476,17 @@ dispinterface DWebBrowserEvents2 [in] VARIANT *RedirectURL, [in] VARIANT *Frame, [in] VARIANT *StatusCode); + + [id(DISPID_BEFORESCRIPTEXECUTE)] + void BeforeScriptExecute([in] IDispatch *pDispWindow); + + [id(DISPID_WEBWORKERSTARTED)] + void WebWorkerStarted( + [in] DWORD dwUniqueID, + [in] BSTR bstrWorkerLabel); + + [id(DISPID_WEBWORKERFINISHED)] + void WebWorkerFinsihed([in] DWORD dwUniqueID); } [ diff --git a/include/exdispid.h b/include/exdispid.h index 012f704..6902f99 100644 --- a/include/exdispid.h +++ b/include/exdispid.h @@ -70,6 +70,9 @@ #define DISPID_NEWPROCESS 284 #define DISPID_THIRDPARTYURLBLOCKED 285 #define DISPID_REDIRECTXDOMAINBLOCKED 286 +#define DISPID_WEBWORKERSTARTED 288 +#define DISPID_WEBWORKERFINISHED 289 +#define DISPID_BEFORESCRIPTEXECUTE 290 #define DISPID_PRINTTEMPLATEINSTANTIATION 225 #define DISPID_PRINTTEMPLATETEARDOWN 226

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

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

Alexandre Julliard : winex11: Include raw motion events in the QS_MOUSEMOVE event filter.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

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

Piotr Caban : comctl32: Set listview focus in WM_LBUTTONDOWN.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: ddcab8aceada5ee7df8bbd3d9c04de4ce5a25725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcab8aceada5ee7df8bbd3d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 19:12:41 2015 +0100 comctl32: Set listview focus in WM_LBUTTONDOWN. This patch reverts commit 098dc7b3302f39c5500d644615a6f4c37d328ce0 and moves focus setting after LVN_ITEMCHANGED notification is sent. Writing tests for it is tricky because native blocks inside WM_LBUTTONDOWN message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e479dca..68a5515 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10266,6 +10266,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN } } + if (!infoPtr->bFocus) + SetFocus(infoPtr->hwndSelf); + if (infoPtr->dwLvExStyle & LVS_EX_ONECLICKACTIVATE) if(lvHitTestInfo.iItem != -1) notify_itemactivate(infoPtr,&lvHitTestInfo); } @@ -10352,9 +10355,6 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT LISTVIEW_DelayedEditItem); } - if (!infoPtr->bFocus) - SetFocus(infoPtr->hwndSelf); - return 0; }

1 0

Alexandre Julliard : ntdll/tests: Use more reasonable timeouts and avoid long long constants.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

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

Hugh McMaster : winex11.drv: Ctrl-Space should generate space, not 0.
by Alexandre Julliard Dec. 1, 2015

Dec. 1, 2015

Module: wine Branch: master Commit: 598d334e73784ab686d460a59301bf9cdeff5719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598d334e73784ab686d460a59… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 1 21:38:00 2015 +1100 winex11.drv: Ctrl-Space should generate space, not 0. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3d68d66..47a9872 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2566,6 +2566,14 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); } + /* Ctrl-Space generates space on Windows */ + if (e.state == ControlMask && virtKey == VK_SPACE) + { + bufW[0] = ' '; + ret = 1; + goto found; + } + if (!e.keycode && virtKey != VK_NONAME) { WARN_(key)("Unknown virtual key %X !!!\n", virtKey);

1 0

Alexandre Julliard : kernel32: Also check OS version to detect old binaries in GlobalMemoryStatus.
by Alexandre Julliard Dec. 1, 2015

Dec. 1, 2015

Module: wine Branch: master Commit: 5468e37508661ab0740f0066f9e1d4eaaca78cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5468e37508661ab0740f0066f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 21:02:19 2015 +0900 kernel32: Also check OS version to detect old binaries in GlobalMemoryStatus. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 0c05de6..eeed785 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1436,7 +1436,8 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) lpBuffer->dwAvailPageFile = 2U*1024*1024*1024 - lpBuffer->dwAvailPhys - 1; /* limit page file size for really old binaries */ - if (nt->OptionalHeader.MajorSubsystemVersion < 4) + if (nt->OptionalHeader.MajorSubsystemVersion < 4 || + nt->OptionalHeader.MajorOperatingSystemVersion < 4) { if (lpBuffer->dwTotalPageFile > MAXLONG) lpBuffer->dwTotalPageFile = MAXLONG; if (lpBuffer->dwAvailPageFile > MAXLONG) lpBuffer->dwAvailPageFile = MAXLONG;

1 0

Alexandre Julliard : winex11: Add a helper function to check a motion event against the serial number.
by Alexandre Julliard Dec. 1, 2015

Dec. 1, 2015

Module: wine Branch: master Commit: 9d237f97fc94f7dcd8afe0763951c601be6449b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d237f97fc94f7dcd8afe0763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 17:42:01 2015 +0900 winex11: Add a helper function to check a motion event against the serial number. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e462b55..356343d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -520,6 +520,21 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) return grab_clipping_window( &rect ); } + +/*********************************************************************** + * is_old_motion_event + */ +static BOOL is_old_motion_event( unsigned long serial ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if (!thread_data->warp_serial) return FALSE; + if ((long)(serial - thread_data->warp_serial) < 0) return TRUE; + thread_data->warp_serial = 0; /* we caught up now */ + return FALSE; +} + + /*********************************************************************** * send_mouse_input * @@ -1576,20 +1591,11 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; - if (!hwnd) + if (!hwnd && is_old_motion_event( event->serial )) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (thread_data->warp_serial) - { - if ((long)(event->serial - thread_data->warp_serial) < 0) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); - return; - } - thread_data->warp_serial = 0; /* we caught up now */ - } + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); + return; } - send_mouse_input( hwnd, event->window, event->state, &input ); } @@ -1677,14 +1683,10 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) break; } - if (broken_rawevents && thread_data->warp_serial) + if (broken_rawevents && is_old_motion_event( xev->serial )) { - if ((long)(xev->serial - thread_data->warp_serial) < 0) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); - return; - } - thread_data->warp_serial = 0; /* we caught up now */ + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); + return; } TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );

1 0

Nikolay Sivov : oledlg: Replace existing menu item in case of empty object too.
by Alexandre Julliard Dec. 1, 2015

Dec. 1, 2015

Module: wine Branch: master Commit: 93ff3fde8a7f04f7a363c4ee71d020ff2a51e911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ff3fde8a7f04f7a363c4ee7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 04:13:38 2015 +0300 oledlg: Replace existing menu item in case of empty object too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/oledlg_main.c | 1 + dlls/oledlg/tests/main.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 87df968..8ba9f17 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -184,6 +184,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); /* no object, or object without enumeration support */ if (!object || !enumverbs) { + RemoveMenu(hMenu, uPos, MF_BYPOSITION); InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_STRING|MF_GRAYED, idmin, resstrW); return FALSE; } diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index 9c5e4bd..5d452f1 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -303,6 +303,7 @@ static IOleObject oleobject = { &oleobjectvtbl }; static void test_OleUIAddVerbMenu(void) { + static const WCHAR cadabraW[] = {'c','a','d','a','b','r','a',0}; HMENU hMenu, verbmenu; MENUITEMINFOW info; WCHAR buffW[50]; @@ -418,6 +419,72 @@ static void test_OleUIAddVerbMenu(void) ok(count == 5, "got %d\n", count); DestroyMenu(hMenu); + + /* try to add verb menu repeatedly, with same id */ + hMenu = CreatePopupMenu(); + + count = GetMenuItemCount(hMenu); + ok(count == 0, "got %d\n", count); + + verbmenu = NULL; + ret = OleUIAddVerbMenuW(NULL, NULL, hMenu, 0, 5, 10, TRUE, 3, &verbmenu); + ok(!ret, "got %d\n", ret); + ok(verbmenu == NULL, "got %p\n", verbmenu); + + count = GetMenuItemCount(hMenu); + ok(count == 1, "got %d\n", count); + + verbmenu = NULL; + ret = OleUIAddVerbMenuW(NULL, NULL, hMenu, 0, 5, 10, TRUE, 3, &verbmenu); + ok(!ret, "got %d\n", ret); + ok(verbmenu == NULL, "got %p\n", verbmenu); + + count = GetMenuItemCount(hMenu); + ok(count == 1, "got %d\n", count); + + /* same position, different id */ + verbmenu = NULL; + ret = OleUIAddVerbMenuW(NULL, NULL, hMenu, 0, 6, 10, TRUE, 3, &verbmenu); + ok(!ret, "got %d\n", ret); + ok(verbmenu == NULL, "got %p\n", verbmenu); + + count = GetMenuItemCount(hMenu); + ok(count == 1, "got %d\n", count); + + /* change added item string and state */ + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + info.fMask = MIIM_STRING|MIIM_STATE; + info.fState = MFS_ENABLED; + info.dwTypeData = buffW; + lstrcpyW(buffW, cadabraW); + ret = SetMenuItemInfoW(hMenu, 0, TRUE, &info); + ok(ret, "got %d\n", ret); + + buffW[0] = 0; + GetMenuStringW(hMenu, 0, buffW, sizeof(buffW)/sizeof(buffW[0]), MF_BYPOSITION); + ok(!lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); + + verbmenu = NULL; + ret = OleUIAddVerbMenuW(NULL, NULL, hMenu, 0, 5, 10, TRUE, 3, &verbmenu); + ok(!ret, "got %d\n", ret); + ok(verbmenu == NULL, "got %p\n", verbmenu); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + info.fMask = MIIM_STRING|MIIM_STATE; + buffW[0] = 0; + info.dwTypeData = buffW; + info.cch = sizeof(buffW)/sizeof(WCHAR); + ret = GetMenuItemInfoW(hMenu, 0, TRUE, &info); + ok(ret, "got %d\n", ret); + ok(lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); + ok(info.fState == MF_GRAYED, "got state 0x%08x\n", info.fState); + + count = GetMenuItemCount(hMenu); + ok(count == 1, "got %d\n", count); + + DestroyMenu(hMenu); } START_TEST(main)

1 0

Nikolay Sivov : oleaut32/tests: Some tests for SafeArrayDestroyData().
by Alexandre Julliard Dec. 1, 2015

Dec. 1, 2015

Module: wine Branch: master Commit: b07ebe6815acbd14afc1dcf9b1335689667fc529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07ebe6815acbd14afc1dcf9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 30 23:28:44 2015 +0300 oleaut32/tests: Some tests for SafeArrayDestroyData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 75 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 12e1f54..f57b886 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1965,40 +1965,99 @@ static void test_SafeArrayChangeTypeEx(void) static void test_SafeArrayDestroyData (void) { - SAFEARRAYBOUND sab; + SAFEARRAYBOUND sab[2]; SAFEARRAY *sa; HRESULT hres; int value = 0xdeadbeef; LONG index[1]; void *temp_pvData; + USHORT features; - sab.lLbound = 0; - sab.cElements = 10; - sa = SafeArrayCreate(VT_INT, 1, &sab); + sab[0].lLbound = 0; + sab[0].cElements = 10; + sa = SafeArrayCreate(VT_INT, 1, sab); ok(sa != NULL, "Create() failed.\n"); - if (!sa) - return; + ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); + index[0] = 1; SafeArrayPutElement (sa, index, &value); /* SafeArrayDestroyData shouldn't free pvData if FADF_STATIC is set. */ - sa->fFeatures |= FADF_STATIC; + features = (sa->fFeatures |= FADF_STATIC); temp_pvData = sa->pvData; hres = SafeArrayDestroyData(sa); ok(hres == S_OK, "SADData FADF_STATIC failed, error code %x.\n",hres); + ok(features == sa->fFeatures, "got 0x%x\n", sa->fFeatures); ok(sa->pvData == temp_pvData, "SADData FADF_STATIC: pvData=%p, expected %p (fFeatures = %d).\n", sa->pvData, temp_pvData, sa->fFeatures); SafeArrayGetElement (sa, index, &value); ok(value == 0, "Data not cleared after SADData\n"); /* Clear FADF_STATIC, now really destroy the data. */ - sa->fFeatures ^= FADF_STATIC; + features = (sa->fFeatures ^= FADF_STATIC); hres = SafeArrayDestroyData(sa); ok(hres == S_OK, "SADData !FADF_STATIC failed, error code %x.\n",hres); + ok(features == sa->fFeatures, "got 0x%x\n", sa->fFeatures); ok(sa->pvData == NULL, "SADData !FADF_STATIC: pvData=%p, expected NULL.\n", sa->pvData); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "SAD failed, error code %x.\n", hres); + + /* two dimensions */ + sab[0].lLbound = 0; + sab[0].cElements = 10; + sab[1].lLbound = 0; + sab[1].cElements = 10; + + sa = SafeArrayCreate(VT_INT, 2, sab); + ok(sa != NULL, "Create() failed.\n"); + ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); + + features = sa->fFeatures; + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n",hres); + ok(features == sa->fFeatures, "got 0x%x\n", sa->fFeatures); + + SafeArrayDestroy(sa); + + /* try to destroy data from descriptor */ + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyDescriptor(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = SafeArrayAllocDescriptor(2, &sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(sa->fFeatures == 0, "got 0x%x\n", sa->fFeatures); + + hres = SafeArrayDestroyDescriptor(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* vector case */ + sa = SafeArrayCreateVector(VT_I4, 0, 10); + ok(sa != NULL, "got %p\n", sa); + ok(sa->fFeatures == (FADF_CREATEVECTOR|FADF_HAVEVARTYPE), "got 0x%x\n", sa->fFeatures); + + ok(sa->pvData != NULL, "got %p\n", sa->pvData); + hres = SafeArrayDestroyData(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); +todo_wine + ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); + ok(sa->pvData != NULL, "got %p\n", sa->pvData); + /* There seems to be a bug on windows, especially visible on 64bit systems, + probably double-free of similar issue. */ + sa->pvData = NULL; + SafeArrayDestroy(sa); } static void test_safearray_layout(void)

1 0