April 2015 - Wine-Commits - list.winehq.org

Jacek Caban : wmsdkidl.idl: Added WMCreateReader declaration.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: f991b70de49d7e2249c9b715ace2f32c6245833b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f991b70de49d7e2249c9b715a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 16:23:07 2015 +0200 wmsdkidl.idl: Added WMCreateReader declaration. --- include/wmsdkidl.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index dc584fc..ddfd12b 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1017,6 +1017,7 @@ interface IWMWriterAdvanced3 : IWMWriterAdvanced2 } cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") +cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Andrew Eikum : wineoss.drv: Cap reported OSS fill level to expected level.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 025e6650e4378771a4fd1a872bebfbfb2b2b72d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025e6650e4378771a4fd1a872… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 6 08:21:48 2015 -0500 wineoss.drv: Cap reported OSS fill level to expected level. Some devices apparently return that the buffer contains an extra frame that we never wrote. We should account for that to avoid an integer underflow. --- dlls/wineoss.drv/mmdevdrv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ccd5c86..d2a0c86 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1412,6 +1412,12 @@ static void oss_write_data(ACImpl *This) }else in_oss_frames = (This->oss_bufsize_bytes - bi.bytes) / This->fmt->nBlockAlign; + if(in_oss_frames > This->in_oss_frames){ + TRACE("Capping reported frames from %u to %u\n", + in_oss_frames, This->in_oss_frames); + in_oss_frames = This->in_oss_frames; + } + write_limit = 0; while(write_limit + in_oss_frames < max_period * 3) write_limit += max_period;

1 0

Thomas Faber : include: Add missing retval attribute to propget output parameters (MIDL).
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: f962c7e0dc1efd824864bb3aaf79e5e3622019b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f962c7e0dc1efd824864bb3aa… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Apr 6 15:28:05 2015 +0200 include: Add missing retval attribute to propget output parameters (MIDL). --- include/control.idl | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/include/control.idl b/include/control.idl index 884c410..529d435 100644 --- a/include/control.idl +++ b/include/control.idl @@ -69,9 +69,9 @@ library QuartzTypeLib interface IBasicAudio : IDispatch { [propput] HRESULT Volume( [in] LONG lVolume ); - [propget] HRESULT Volume( [out] LONG *plVolume ); + [propget] HRESULT Volume( [out, retval] LONG *plVolume ); [propput] HRESULT Balance( [in] LONG lBalance ); - [propget] HRESULT Balance( [out] LONG *plBalance ); + [propget] HRESULT Balance( [out, retval] LONG *plBalance ); } @@ -86,34 +86,34 @@ library QuartzTypeLib interface IVideoWindow : IDispatch { [propput] HRESULT Caption( [in] BSTR strCaption ); - [propget] HRESULT Caption( [out] BSTR *strCaption ); + [propget] HRESULT Caption( [out, retval] BSTR *strCaption ); [propput] HRESULT WindowStyle( [in] LONG WindowStyle ); - [propget] HRESULT WindowStyle( [out] LONG *WindowStyle ); + [propget] HRESULT WindowStyle( [out, retval] LONG *WindowStyle ); [propput] HRESULT WindowStyleEx( [in] LONG WindowStyleEx ); - [propget] HRESULT WindowStyleEx( [out] LONG *WindowStyleEx ); + [propget] HRESULT WindowStyleEx( [out, retval] LONG *WindowStyleEx ); [propput] HRESULT AutoShow( [in] LONG AutoShow ); - [propget] HRESULT AutoShow( [out] LONG *AutoShow ); + [propget] HRESULT AutoShow( [out, retval] LONG *AutoShow ); [propput] HRESULT WindowState( [in] LONG WindowState ); - [propget] HRESULT WindowState( [out] LONG *WindowState ); + [propget] HRESULT WindowState( [out, retval] LONG *WindowState ); [propput] HRESULT BackgroundPalette( [in] LONG BackgroundPalette ); - [propget] HRESULT BackgroundPalette( [out] LONG *pBackgroundPalette ); + [propget] HRESULT BackgroundPalette( [out, retval] LONG *pBackgroundPalette ); [propput] HRESULT Visible( [in] LONG Visible ); - [propget] HRESULT Visible( [out] LONG *pVisible ); + [propget] HRESULT Visible( [out, retval] LONG *pVisible ); [propput] HRESULT Left( [in] LONG Left ); - [propget] HRESULT Left( [out] LONG *pLeft ); + [propget] HRESULT Left( [out, retval] LONG *pLeft ); [propput] HRESULT Width( [in] LONG Width ); - [propget] HRESULT Width( [out] LONG *pWidth ); + [propget] HRESULT Width( [out, retval] LONG *pWidth ); [propput] HRESULT Top( [in] LONG Top ); - [propget] HRESULT Top( [out] LONG *pTop ); + [propget] HRESULT Top( [out, retval] LONG *pTop ); [propput] HRESULT Height( [in] LONG Height ); - [propget] HRESULT Height( [out] LONG *pHeight ); + [propget] HRESULT Height( [out, retval] LONG *pHeight ); [propput] HRESULT Owner( [in] OAHWND Owner ); - [propget] HRESULT Owner( [out] OAHWND *Owner ); + [propget] HRESULT Owner( [out, retval] OAHWND *Owner ); [propput] HRESULT MessageDrain( [in] OAHWND Drain ); - [propget] HRESULT MessageDrain( [out] OAHWND *Drain ); - [propget] HRESULT BorderColor( [out] LONG *Color ); + [propget] HRESULT MessageDrain( [out, retval] OAHWND *Drain ); + [propget] HRESULT BorderColor( [out, retval] LONG *Color ); [propput] HRESULT BorderColor( [in] LONG Color ); - [propget] HRESULT FullScreenMode( [out] LONG *FullScreenMode ); + [propget] HRESULT FullScreenMode( [out, retval] LONG *FullScreenMode ); [propput] HRESULT FullScreenMode( [in] LONG FullScreenMode ); HRESULT SetWindowForeground( [in] LONG Focus ); HRESULT NotifyOwnerMessage( [in] OAHWND hwnd, [in] LONG uMsg, [in] LONG_PTR wParam, [in] LONG_PTR lParam ); @@ -137,27 +137,27 @@ library QuartzTypeLib ] interface IBasicVideo : IDispatch { - [propget] HRESULT AvgTimePerFrame( [out] REFTIME *pAvgTimePerFrame ); - [propget] HRESULT BitRate( [out] LONG *pBitRate ); - [propget] HRESULT BitErrorRate( [out] LONG *pBitErrorRate ); - [propget] HRESULT VideoWidth( [out] LONG *pVideoWidth ); - [propget] HRESULT VideoHeight( [out] LONG *pVideoHeight ); + [propget] HRESULT AvgTimePerFrame( [out, retval] REFTIME *pAvgTimePerFrame ); + [propget] HRESULT BitRate( [out, retval] LONG *pBitRate ); + [propget] HRESULT BitErrorRate( [out, retval] LONG *pBitErrorRate ); + [propget] HRESULT VideoWidth( [out, retval] LONG *pVideoWidth ); + [propget] HRESULT VideoHeight( [out, retval] LONG *pVideoHeight ); [propput] HRESULT SourceLeft( [in] LONG SourceLeft ); - [propget] HRESULT SourceLeft( [out] LONG *pSourceLeft ); + [propget] HRESULT SourceLeft( [out, retval] LONG *pSourceLeft ); [propput] HRESULT SourceWidth( [in] LONG SourceWidth ); - [propget] HRESULT SourceWidth( [out] LONG *pSourceWidth ); + [propget] HRESULT SourceWidth( [out, retval] LONG *pSourceWidth ); [propput] HRESULT SourceTop( [in] LONG SourceTop ); - [propget] HRESULT SourceTop( [out] LONG *pSourceTop ); + [propget] HRESULT SourceTop( [out, retval] LONG *pSourceTop ); [propput] HRESULT SourceHeight( [in] LONG SourceHeight ); - [propget] HRESULT SourceHeight( [out] LONG *pSourceHeight ); + [propget] HRESULT SourceHeight( [out, retval] LONG *pSourceHeight ); [propput] HRESULT DestinationLeft( [in] LONG DestinationLeft ); - [propget] HRESULT DestinationLeft( [out] LONG *pDestinationLeft ); + [propget] HRESULT DestinationLeft( [out, retval] LONG *pDestinationLeft ); [propput] HRESULT DestinationWidth( [in] LONG DestinationWidth ); - [propget] HRESULT DestinationWidth( [out] LONG *pDestinationWidth ); + [propget] HRESULT DestinationWidth( [out, retval] LONG *pDestinationWidth ); [propput] HRESULT DestinationTop( [in] LONG DestinationTop ); - [propget] HRESULT DestinationTop( [out] LONG *pDestinationTop ); + [propget] HRESULT DestinationTop( [out, retval] LONG *pDestinationTop ); [propput] HRESULT DestinationHeight( [in] LONG DestinationHeight ); - [propget] HRESULT DestinationHeight( [out] LONG *pDestinationHeight ); + [propget] HRESULT DestinationHeight( [out, retval] LONG *pDestinationHeight ); HRESULT SetSourcePosition( [in] LONG Left, [in] LONG Top, [in] LONG Width, [in] LONG Height ); HRESULT GetSourcePosition( [out] LONG *pLeft, [out] LONG *pTop, [out] LONG *pWidth, [out] LONG *pHeight ); HRESULT SetDefaultSourcePosition();

1 0

Nikolay Sivov : scrrun: Implement GetSpecialFolder().
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 533323d70397a53a2ce5002dc2038bcf5f122344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533323d70397a53a2ce5002dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 6 12:50:23 2015 +0300 scrrun: Implement GetSpecialFolder(). --- dlls/scrrun/filesystem.c | 36 ++++++++++++++++++++++++++++--- dlls/scrrun/tests/filesystem.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5e0fc28..8b771c7 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3285,11 +3285,41 @@ static HRESULT WINAPI filesys_GetFolder(IFileSystem3 *iface, BSTR FolderPath, static HRESULT WINAPI filesys_GetSpecialFolder(IFileSystem3 *iface, SpecialFolderConst SpecialFolder, - IFolder **ppfolder) + IFolder **folder) { - FIXME("%p %d %p\n", iface, SpecialFolder, ppfolder); + WCHAR pathW[MAX_PATH]; + DWORD ret; - return E_NOTIMPL; + TRACE("%p %d %p\n", iface, SpecialFolder, folder); + + if (!folder) + return E_POINTER; + + *folder = NULL; + + switch (SpecialFolder) + { + case WindowsFolder: + ret = GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + break; + case SystemFolder: + ret = GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + break; + case TemporaryFolder: + ret = GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + /* we don't want trailing backslash */ + if (ret && pathW[ret-1] == '\\') + pathW[ret-1] = 0; + break; + default: + FIXME("unknown special folder type, %d\n", SpecialFolder); + return E_INVALIDARG; + } + + if (!ret) + return HRESULT_FROM_WIN32(GetLastError()); + + return create_folder(pathW, folder); } static inline HRESULT delete_file(const WCHAR *file, DWORD file_len, VARIANT_BOOL force) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 987ecba..db7c338 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1907,6 +1907,54 @@ static void test_GetExtensionName(void) } } +static void test_GetSpecialFolder(void) +{ + WCHAR pathW[MAX_PATH]; + IFolder *folder; + HRESULT hr; + DWORD ret; + BSTR path; + + hr = IFileSystem3_GetSpecialFolder(fs3, WindowsFolder, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFileSystem3_GetSpecialFolder(fs3, TemporaryFolder+1, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFileSystem3_GetSpecialFolder(fs3, TemporaryFolder+1, &folder); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IFileSystem3_GetSpecialFolder(fs3, WindowsFolder, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IFolder_get_Path(folder, &path); + ok(hr == S_OK, "got 0x%08x\n", hr); + GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + ok(!lstrcmpiW(pathW, path), "got %s, expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(pathW)); + SysFreeString(path); + IFolder_Release(folder); + + hr = IFileSystem3_GetSpecialFolder(fs3, SystemFolder, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IFolder_get_Path(folder, &path); + ok(hr == S_OK, "got 0x%08x\n", hr); + GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + ok(!lstrcmpiW(pathW, path), "got %s, expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(pathW)); + SysFreeString(path); + IFolder_Release(folder); + + hr = IFileSystem3_GetSpecialFolder(fs3, TemporaryFolder, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IFolder_get_Path(folder, &path); + ok(hr == S_OK, "got 0x%08x\n", hr); + ret = GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + if (ret && pathW[ret-1] == '\\') + pathW[ret-1] = 0; + + ok(!lstrcmpiW(pathW, path), "got %s, expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(pathW)); + SysFreeString(path); + IFolder_Release(folder); +} + START_TEST(filesystem) { HRESULT hr; @@ -1942,6 +1990,7 @@ START_TEST(filesystem) test_GetDriveName(); test_SerialNumber(); test_GetExtensionName(); + test_GetSpecialFolder(); IFileSystem3_Release(fs3);

1 0

Jacek Caban : wmvcore: Added IWMReaderAdvanced* stub implementation.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 1c9d6e72e5002d9d75cb9e10c1f44e84ee945931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c9d6e72e5002d9d75cb9e10c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 14:42:48 2015 +0200 wmvcore: Added IWMReaderAdvanced* stub implementation. --- dlls/wmvcore/wmvcore_main.c | 447 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 447 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c9d6e72e5002d9d75cb9…

1 0

Alexandre Julliard : msvcp60: Merge more I/ O stream code with msvcp90 to reduce the differences.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: a826c31f00088b84c8f743d6eca1e8eef3227f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a826c31f00088b84c8f743d6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:48:34 2015 +0900 msvcp60: Merge more I/O stream code with msvcp90 to reduce the differences. --- dlls/msvcp60/ios.c | 1287 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp60/msvcp.h | 21 + dlls/msvcp70/msvcp70.spec | 18 +- dlls/msvcp71/msvcp71.spec | 12 +- dlls/msvcp80/msvcp80.spec | 12 +- dlls/msvcp90/ios.c | 90 +++- dlls/msvcp90/msvcp90.spec | 12 +- 7 files changed, 1362 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a826c31f00088b84c8f74…

1 0

Stas Cymbalov : dsound: Fix angle to sound source calculation.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: c1c108f58ce84a2aeefdc93de26287198acc6348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c108f58ce84a2aeefdc93de… Author: Stas Cymbalov <dummyunit(a)gmail.com> Date: Sun Mar 22 18:22:49 2015 +0300 dsound: Fix angle to sound source calculation. --- dlls/dsound/sound3d.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 9a0226a..ffd4d45 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -112,7 +112,6 @@ static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECT cos = product/(la*lb); angle = acos(cos); - if (cos < 0.0f) { angle -= M_PI; } TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x, b->y, b->z, angle, RadToDeg(angle)); return angle; @@ -264,16 +263,20 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) else { vLeft = VectorProduct(&dsb->device->ds3dl.vOrientFront, &dsb->device->ds3dl.vOrientTop); - flAngle = AngleBetweenVectorsRad(&dsb->device->ds3dl.vOrientFront, &vDistance); - flAngle2 = AngleBetweenVectorsRad(&vLeft, &vDistance); - - /* AngleBetweenVectorsRad performs a dot product, which gives us the cosine of the angle - * between two vectors. Unfortunately, because cos(theta) = cos(-theta), we've no idea from - * this whether the sound is to our left or to our right. We have to perform another dot - * product, with a vector at right angles to the initial one, to get the correct angle. - * The angle should be between -180 degrees and 180 degrees. */ - if (flAngle < 0.0f) { flAngle += M_PI; } - if (flAngle2 > 0.0f) { flAngle = -flAngle; } + /* To calculate angle to sound source we need to: + * 1) Get angle between vDistance and a plane on which angle to sound source should be 0. + * Such a plane is given by vectors vOrientFront and vOrientTop, and angle between vector + * and a plane equals to M_PI_2 - angle between vector and normal to this plane (vLeft in this case). + * 2) Determine if the source is behind or in front of us by calculating angle between vDistance + * and vOrientFront. + */ + flAngle = AngleBetweenVectorsRad(&vLeft, &vDistance); + flAngle2 = AngleBetweenVectorsRad(&dsb->device->ds3dl.vOrientFront, &vDistance); + if (flAngle2 > M_PI_2) + flAngle = -flAngle; + flAngle -= M_PI_2; + if (flAngle < -M_PI) + flAngle += 2*M_PI; } TRACE("panning: Angle = %f rad, lPan = %d\n", flAngle, dsb->volpan.lPan);

1 0

Sebastian Lackner : ntoskrnl: Avoid repeated FIXME messages in PsLookupProcessByProcessId.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 01c2af446a325bcb5535ee1665a4abc7fa99c2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c2af446a325bcb5535ee166… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 27 08:15:14 2015 +0100 ntoskrnl: Avoid repeated FIXME messages in PsLookupProcessByProcessId. --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 95dcdc9..bb26424 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1885,7 +1885,8 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) */ NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) { - FIXME("(%p %p) stub\n", processid, process); + static int once; + if (!once++) FIXME("(%p %p) stub\n", processid, process); return STATUS_NOT_IMPLEMENTED; }

1 0

Sebastian Lackner : user32/tests: Add tests for ToAscii.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 26c9ce5d0b10493cf5acaed0d6d5604331302655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c9ce5d0b10493cf5acaed0d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 6 10:27:29 2015 +0200 user32/tests: Add tests for ToAscii. --- dlls/user32/tests/input.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 6f20496..faf9c8c 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1604,6 +1604,53 @@ static void test_ToUnicode(void) ok(ret == 0, "ToUnicodeEx with NULL keystate didn't return 0 (was %i)\n", ret); } +static void test_ToAscii(void) +{ + WORD character; + BYTE state[256]; + const BYTE SC_RETURN = 0x1c, SC_A = 0x1e; + const BYTE HIGHEST_BIT = 0x80; + int ret; + + memset(state, 0, sizeof(state)); + + character = 0; + ret = ToAscii(VK_RETURN, SC_RETURN, state, &character, 0); + ok(ret == 1, "ToAscii for Return key didn't return 1 (was %i)\n", ret); + ok(character == '\r', "ToAscii for Return was %i (expected 13)\n", character); + + character = 0; + ret = ToAscii('A', SC_A, state, &character, 0); + ok(ret == 1, "ToAscii for character 'A' didn't return 1 (was %i)\n", ret); + ok(character == 'a', "ToAscii for character 'A' was %i (expected %i)\n", character, 'a'); + + state[VK_CONTROL] |= HIGHEST_BIT; + state[VK_LCONTROL] |= HIGHEST_BIT; + character = 0; + ret = ToAscii(VK_RETURN, SC_RETURN, state, &character, 0); + ok(ret == 1, "ToAscii for CTRL + Return key didn't return 1 (was %i)\n", ret); + ok(character == '\n', "ToAscii for CTRL + Return was %i (expected 10)\n", character); + + character = 0; + ret = ToAscii('A', SC_A, state, &character, 0); + ok(ret == 1, "ToAscii for CTRL + character 'A' didn't return 1 (was %i)\n", ret); + ok(character == 1, "ToAscii for CTRL + character 'A' was %i (expected 1)\n", character); + + state[VK_SHIFT] |= HIGHEST_BIT; + state[VK_LSHIFT] |= HIGHEST_BIT; + ret = ToAscii(VK_RETURN, SC_RETURN, state, &character, 0); + todo_wine ok(ret == 0, "ToAscii for CTRL + Shift + Return key didn't return 0 (was %i)\n", ret); + + ret = ToAscii(VK_RETURN, SC_RETURN, NULL, &character, 0); + ok(ret == 0, "ToAscii for NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToAscii('A', SC_A, NULL, &character, 0); + ok(ret == 0, "ToAscii for NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToAsciiEx(VK_RETURN, SC_RETURN, NULL, &character, 0, GetKeyboardLayout(0)); + ok(ret == 0, "ToAsciiEx for NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToAsciiEx('A', SC_A, NULL, &character, 0, GetKeyboardLayout(0)); + ok(ret == 0, "ToAsciiEx for NULL keystate didn't return 0 (was %i)\n", ret); +} + static void test_get_async_key_state(void) { /* input value sanity checks */ @@ -1995,6 +2042,7 @@ START_TEST(input) test_mouse_ll_hook(); test_key_map(); test_ToUnicode(); + test_ToAscii(); test_get_async_key_state(); test_keyboard_layout_name(); test_key_names();

1 0

Jason Overland : winecfg: Add owner to file picker dialogs, making them modal.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 4b18b0d10e7e193b0992ad1f67062894df1b42e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b18b0d10e7e193b0992ad1f6… Author: Jason Overland <jasonoverland(a)gmail.com> Date: Sun Apr 5 22:44:48 2015 -0700 winecfg: Add owner to file picker dialogs, making them modal. --- programs/winecfg/appdefaults.c | 2 +- programs/winecfg/theme.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 49531fa..fad9e5c 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -326,7 +326,7 @@ static void on_add_app_click(HWND dialog) static const WCHAR pathC[] = { 'c',':','\\',0 }; OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), - 0, /*hInst*/0, 0, NULL, 0, 0, NULL, + dialog, /*hInst*/0, 0, NULL, 0, 0, NULL, 0, NULL, 0, pathC, 0, OFN_SHOWHELP | OFN_HIDEREADONLY | OFN_ENABLESIZING, 0, 0, NULL, 0, NULL }; diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 6db602f..8ffc9bb 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -635,7 +635,7 @@ static void on_theme_install(HWND dialog) title, sizeof (title) / sizeof (title[0])); ofn.lStructSize = sizeof(OPENFILENAMEW); - ofn.hwndOwner = 0; + ofn.hwndOwner = dialog; ofn.hInstance = 0; ofn.lpstrFilter = filter; ofn.lpstrCustomFilter = NULL;

1 0

Bruno Jesus : ws2_32: Fix copy & paste error in fd_sets_to_poll (Coverity) .
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 5c8aad8d76828dd60a4e9d3639d546eaa586d68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8aad8d76828dd60a4e9d363… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Apr 5 11:48:57 2015 -0300 ws2_32: Fix copy & paste error in fd_sets_to_poll (Coverity). --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d8d724b..7f3134e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4625,7 +4625,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set } else { - release_sock_fd( readfds->fd_array[i], fds[j].fd ); + release_sock_fd( writefds->fd_array[i], fds[j].fd ); fds[j].fd = -1; fds[j].events = 0; } @@ -4650,7 +4650,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set } else { - release_sock_fd( readfds->fd_array[i], fds[j].fd ); + release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); fds[j].fd = -1; fds[j].events = 0; }

1 0

Nikolay Sivov : browseui: Return interface pointer instead of impl pointer.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 77a63b724564514f41da29aecc595c7ef323e716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a63b724564514f41da29aec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:39:26 2015 +0300 browseui: Return interface pointer instead of impl pointer. --- dlls/browseui/aclmulti.c | 2 +- dlls/browseui/aclsource.c | 2 +- dlls/browseui/compcatcachedaemon.c | 2 +- dlls/browseui/progressdlg.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index e7edece..6deb30d 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -325,7 +325,7 @@ HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IEnumString_iface; BROWSEUI_refCount++; return S_OK; } diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index aa31d08..07033cc 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -147,6 +147,6 @@ HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IACList2_iface; return S_OK; } diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 5ed9f37..a5c97e9 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -158,7 +158,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CompCatCacheDaemon.cs"); TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IRunnableTask_iface; InterlockedIncrement(&BROWSEUI_refCount); return S_OK; } diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 7d07ee9..70c78c9 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -579,7 +579,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs"); TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IProgressDialog_iface; InterlockedIncrement(&BROWSEUI_refCount); return S_OK; }

1 0

Nikolay Sivov : dmscript: Implement GetClassID() for IDirectMusicTrack.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 52251ac6da29c261501029c8868368c37840a69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=52251ac6da29c261501029c88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:07:00 2015 +0300 dmscript: Implement GetClassID() for IDirectMusicTrack. --- dlls/dmscript/scripttrack.c | 12 ++++++++++-- dlls/dmscript/tests/dmscript.c | 8 ++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index ddae8b5..bc8e8ce 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -264,7 +264,15 @@ static ULONG WINAPI IPersistStreamImpl_Release(IPersistStream *iface) static HRESULT WINAPI IPersistStreamImpl_GetClassID(IPersistStream *iface, CLSID *pClassID) { - return E_NOTIMPL; + DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); + + TRACE("(%p, %p)\n", This, pClassID); + + if (!pClassID) + return E_POINTER; + + *pClassID = This->desc.guidClass; + return S_OK; } static HRESULT WINAPI IPersistStreamImpl_IsDirty(IPersistStream *iface) @@ -319,7 +327,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IPersistStream_iface.lpVtbl = &persist_vtbl; track->desc.dwSize = sizeof(track->desc); - track->desc.dwValidData |= DMUS_OBJ_CLASS; + track->desc.dwValidData = DMUS_OBJ_CLASS; track->desc.guidClass = CLSID_DirectMusicScriptTrack; track->ref = 1; diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 59858d5..82e874c 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -217,9 +217,13 @@ static void test_scripttrack(void) /* IPersistStream */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + + hr = IPersistStream_GetClassID(ps, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), "Expected class CLSID_DirectMusicScriptTrack got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */

1 0

Sebastian Lackner : include: Automatically detect if tests are running under Wine when WINETEST_PLATFORM is not specified.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 61b8a189c531ab1712039355267c45fca5b5d032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b8a189c531ab17120393552… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Nov 23 22:50:34 2014 +0100 include: Automatically detect if tests are running under Wine when WINETEST_PLATFORM is not specified. --- include/wine/test.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index f8b608f..567229a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -618,6 +618,14 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) return EXCEPTION_EXECUTE_HANDLER; } +/* check if we're running under wine */ +static BOOL running_under_wine(void) +{ + HMODULE module = GetModuleHandleA( "ntdll.dll" ); + if (!module) return FALSE; + return (GetProcAddress( module, "wine_server_call" ) != NULL); +} + #ifdef __GNUC__ void _fpreset(void) {} /* override the mingw fpu init code */ #endif @@ -632,7 +640,11 @@ int main( int argc, char **argv ) winetest_argc = argc; winetest_argv = argv; - if (GetEnvironmentVariableA( "WINETEST_PLATFORM", p, sizeof(p) )) winetest_platform = strdup(p); + if (GetEnvironmentVariableA( "WINETEST_PLATFORM", p, sizeof(p) )) + winetest_platform = strdup(p); + else if (running_under_wine()) + winetest_platform = "wine"; + if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p);

1 0

Sebastian Lackner : secur32: Return more context attributes in schan_InitializeSecurityContextW.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 8729575112802b34c6509642187b67d6873d2c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8729575112802b34c65096421… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 11 08:50:46 2014 +0100 secur32: Return more context attributes in schan_InitializeSecurityContextW. --- dlls/secur32/schannel.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5b86a75..12d4c8d 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -908,8 +908,16 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } *pfContextAttr = 0; + if (ctx->req_ctx_attr & ISC_REQ_REPLAY_DETECT) + *pfContextAttr |= ISC_RET_REPLAY_DETECT; + if (ctx->req_ctx_attr & ISC_REQ_SEQUENCE_DETECT) + *pfContextAttr |= ISC_RET_SEQUENCE_DETECT; + if (ctx->req_ctx_attr & ISC_REQ_CONFIDENTIALITY) + *pfContextAttr |= ISC_RET_CONFIDENTIALITY; if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; + if (ctx->req_ctx_attr & ISC_REQ_STREAM) + *pfContextAttr |= ISC_RET_STREAM; return ret; }

1 0

Sebastian Lackner : user32: Check for NULL pointer in ToUnicodeEx.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 1059ee3cba030988091b54254a13d5899621e3c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1059ee3cba030988091b54254… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 6 10:18:04 2015 +0200 user32: Check for NULL pointer in ToUnicodeEx. --- dlls/user32/input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 0ed4218..b6eecbe 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1022,6 +1022,7 @@ INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, LPWSTR lpwStr, int size, UINT flags, HKL hkl) { + if (!lpKeyState) return 0; return USER_Driver->pToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, hkl); }

1 0

Mark Harmstone : kernel32: Stub out GetFileMUIPath.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: ed0c6746dd66f88939ee7623c521f81aa6704f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0c6746dd66f88939ee7623c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 4 17:09:09 2015 +0100 kernel32: Stub out GetFileMUIPath. --- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index e2a7bed..d5daa65 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -12,7 +12,7 @@ @ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW @ stub GetFileMUIInfo -@ stub GetFileMUIPath +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) kernel32.GetFileMUIPath @ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW @ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index 32d2c76..50e113e 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -13,7 +13,7 @@ @ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW @ stub GetFileMUIInfo -@ stub GetFileMUIPath +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) kernel32.GetFileMUIPath @ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW @ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d94c307..130affc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -677,7 +677,7 @@ @ stdcall GetFileInformationByHandle(long ptr) @ stdcall GetFileInformationByHandleEx(long long ptr long) # @ stub GetFileMUIInfo -# @ stub GetFileMUIPath +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) @ stdcall GetFileSize(long ptr) @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 7798b91..9896872 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5300,3 +5300,18 @@ BOOL WINAPI GetUserPreferredUILanguages(DWORD flags, PULONG numlangs, PZZWSTR la FIXME( "stub: %u %p %p %p\n", flags, numlangs, langbuffer, bufferlen ); return FALSE; } + +/****************************************************************************** + * GetFileMUIPath (KERNEL32.@) + */ + +BOOL WINAPI GetFileMUIPath(DWORD flags, PCWSTR filepath, PWSTR language, PULONG languagelen, + PWSTR muipath, PULONG muipathlen, PULONGLONG enumerator) +{ + FIXME("stub: 0x%x, %s, %s, %p, %p, %p, %p\n", flags, debugstr_w(filepath), + debugstr_w(language), languagelen, muipath, muipathlen, enumerator); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return FALSE; +}

1 0

Nikolay Sivov : dwrite: Add cluster metrics entry for inline objects too.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: b16432f2c293e6f122ebf83cc893152ca2e3714d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16432f2c293e6f122ebf83cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:05:52 2015 +0300 dwrite: Add cluster metrics entry for inline objects too. --- dlls/dwrite/layout.c | 172 +++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/layout.c | 12 ++-- 2 files changed, 115 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b16432f2c293e6f122ebf…

1 0

Sebastian Lackner : kernel32: Fix calculation of returned buffer in get_registry_locale_info.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 51c21cca9848d65948d14bd70ddf37ca2e2faf83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c21cca9848d65948d14bd70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 3 14:25:57 2015 +0200 kernel32: Fix calculation of returned buffer in get_registry_locale_info. Fixes a regression introduced by 8826ba1bc86fefa22c543608585ae8f3b4310a5f. --- dlls/kernel32/locale.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index afc5b9d..7798b91 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1177,6 +1177,17 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); + /* try again with a bigger buffer when we have to return the correct size */ + if (status == STATUS_BUFFER_OVERFLOW && !buffer && size > info_size) + { + KEY_VALUE_PARTIAL_INFORMATION *new_info; + if ((new_info = HeapReAlloc( GetProcessHeap(), 0, info, size ))) + { + info = new_info; + status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); + } + } + NtClose( hkey ); if (!status) @@ -1207,8 +1218,6 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS if (status == STATUS_BUFFER_OVERFLOW && !buffer) { ret = (size - info_size) / sizeof(WCHAR); - if (!ret || ((WCHAR *)&info->Data)[ret-1]) - ret++; } else if (status == STATUS_OBJECT_NAME_NOT_FOUND) {

1 0

Sebastian Lackner : user32/tests: Add tests for ToUnicodeEx with a NULL pointer as keystate.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: a2695810e70d0d0147925e80eb4c21ee60eea409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2695810e70d0d0147925e80e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 6 10:23:26 2015 +0200 user32/tests: Add tests for ToUnicodeEx with a NULL pointer as keystate. --- dlls/user32/tests/input.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index a523f0a..6f20496 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1542,7 +1542,7 @@ static void test_ToUnicode(void) { WCHAR wStr[4]; BYTE state[256]; - const BYTE SC_RETURN = 0x1c, SC_TAB = 0x0f; + const BYTE SC_RETURN = 0x1c, SC_TAB = 0x0f, SC_A = 0x1e; const BYTE HIGHEST_BIT = 0x80; int i, ret; for(i=0; i<256; i++) @@ -1564,9 +1564,13 @@ static void test_ToUnicode(void) ok(wStr[1]==0 || broken(wStr[1]!=0) /* nt4 */, "ToUnicode didn't null-terminate the buffer when there was room.\n"); } + + ret = ToUnicode('A', SC_A, state, wStr, 4, 0); + ok(ret == 1, "ToUnicode for character A didn't return 1 (was %i)\n", ret); + ok(wStr[0] == 'a', "ToUnicode for character 'A' was %i (expected %i)\n", wStr[0], 'a'); + state[VK_CONTROL] |= HIGHEST_BIT; state[VK_LCONTROL] |= HIGHEST_BIT; - ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); @@ -1575,12 +1579,29 @@ static void test_ToUnicode(void) if(ret == 1) ok(wStr[0]=='\n', "ToUnicode for CTRL + Return was %i (expected 10)\n", wStr[0]); + ret = ToUnicode('A', SC_A, state, wStr, 4, 0); + ok(ret == 1, "ToUnicode for CTRL + character A didn't return 1 (was %i)\n", ret); + ok(wStr[0] == 1, "ToUnicode for CTRL + character 'A' was %i (expected 1)\n", wStr[0]); + state[VK_SHIFT] |= HIGHEST_BIT; state[VK_LSHIFT] |= HIGHEST_BIT; ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); ok(ret == 0, "ToUnicode for CTRL + SHIFT + Tab didn't return 0 (was %i)\n", ret); ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); todo_wine ok(ret == 0, "ToUnicode for CTRL + SHIFT + Return didn't return 0 (was %i)\n", ret); + + ret = ToUnicode(VK_TAB, SC_TAB, NULL, wStr, 4, 0); + ok(ret == 0, "ToUnicode with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicode(VK_RETURN, SC_RETURN, NULL, wStr, 4, 0); + ok(ret == 0, "ToUnicode with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicode('A', SC_A, NULL, wStr, 4, 0); + ok(ret == 0, "ToUnicode with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicodeEx(VK_TAB, SC_TAB, NULL, wStr, 4, 0, GetKeyboardLayout(0)); + ok(ret == 0, "ToUnicodeEx with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicodeEx(VK_RETURN, SC_RETURN, NULL, wStr, 4, 0, GetKeyboardLayout(0)); + ok(ret == 0, "ToUnicodeEx with NULL keystate didn't return 0 (was %i)\n", ret); + ret = ToUnicodeEx('A', SC_A, NULL, wStr, 4, 0, GetKeyboardLayout(0)); + ok(ret == 0, "ToUnicodeEx with NULL keystate didn't return 0 (was %i)\n", ret); } static void test_get_async_key_state(void)

1 0

Michael Müller : ws2_32: Don' t return an error in WS_select when EINTR happens during timeout.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 0601c86542b16c452c014d5a9a3d6d57e6476796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0601c86542b16c452c014d5a9… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Mar 28 20:47:52 2015 +0100 ws2_32: Don't return an error in WS_select when EINTR happens during timeout. --- dlls/ws2_32/socket.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7f3134e..9d5067a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4780,7 +4780,11 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, } timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000; - if (timeout <= 0) break; + if (timeout <= 0) + { + ret = 0; + break; + } } else break; } release_poll_fds( ws_readfds, ws_writefds, ws_exceptfds, pollfds );

1 0

Andrew Cook : ntdll: Return success for JobObjectBasicUIRestrictions.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 4113fd875c4eaf1fe5d05080f7059c641572a5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4113fd875c4eaf1fe5d05080f… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sun Apr 5 07:04:25 2015 +1000 ntdll: Return success for JobObjectBasicUIRestrictions. --- dlls/ntdll/sync.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a4df88a..5db736e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -634,7 +634,7 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c */ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, PVOID info, ULONG len ) { - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status = STATUS_NOT_IMPLEMENTED; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit; ULONG info_size = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); DWORD limit_flags = JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS; @@ -683,9 +683,11 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla SERVER_END_REQ; break; + case JobObjectBasicUIRestrictions: + status = STATUS_SUCCESS; + /* fallthrough */ default: FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); - return STATUS_NOT_IMPLEMENTED; } return status;

1 0

Mark Harmstone : uxtheme: Fix off-by-one error in array size.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 1a9810b3857487bba14f4a50f6de183a25b5f7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a9810b3857487bba14f4a50f… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 4 11:35:43 2015 +0100 uxtheme: Fix off-by-one error in array size. --- dlls/uxtheme/msstyles.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 8205a12..780751b 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -674,8 +674,8 @@ static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive struct PARSECOLORSTATE { int colorCount; - int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; - COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; + int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR+1]; + COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR+1]; int captionColors; };

1 0

Nikolay Sivov : ole32: Remove a couple of interface casts.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 961b1a270f709264ba3d32345ec7fedb1247efc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961b1a270f709264ba3d32345… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:37:07 2015 +0300 ole32: Remove a couple of interface casts. --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/defaulthandler.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d842aaf..762f011 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4952,8 +4952,8 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) else context->apttype = APTTYPE_STA; - hr = IUnknown_QueryInterface((IUnknown *)&context->IComThreadingInfo_iface, riid, ppv); - IUnknown_Release((IUnknown *)&context->IComThreadingInfo_iface); + hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); + IComThreadingInfo_Release(&context->IComThreadingInfo_iface); return hr; } diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 5e89977..913d4af 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -2185,7 +2185,7 @@ HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) This->refs = 0; This->clsid = *rclsid; - hr = IUnknown_QueryInterface((IUnknown *)&This->IClassFactory_iface, riid, ppv); + hr = IClassFactory_QueryInterface(&This->IClassFactory_iface, riid, ppv); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, This);

1 0

Mark Harmstone : include: Add MUI constants to winnls.h.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 547fcead1ffce42ab4831510c4e3e4f9d5fa48b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547fcead1ffce42ab4831510c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Apr 3 12:12:02 2015 +0100 include: Add MUI constants to winnls.h. --- include/winnls.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index 3dacc09..b1ce0cd 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -574,6 +574,36 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define IDN_ALLOW_UNASSIGNED 0x1 #define IDN_USE_STD3_ASCII_RULES 0x2 +/* MUI defines. */ +#define MUI_LANGUAGE_ID 0x04 +#define MUI_LANGUAGE_NAME 0x08 +#define MUI_MERGE_SYSTEM_FALLBACK 0x10 +#define MUI_MERGE_USER_FALLBACK 0x20 +#define MUI_UI_FALLBACK MUI_MERGE_SYSTEM_FALLBACK | MUI_MERGE_USER_FALLBACK +#define MUI_THREAD_LANGUAGES 0x40 +#define MUI_CONSOLE_FILTER 0x100 +#define MUI_COMPLEX_SCRIPT_FILTER 0x200 +#define MUI_RESET_FILTERS 0x001 +#define MUI_USER_PREFERRED_UI_LANGUAGES 0x10 +#define MUI_USE_INSTALLED_LANGUAGES 0x20 +#define MUI_USE_SEARCH_ALL_LANGUAGES 0x40 +#define MUI_LANG_NEUTRAL_PE_FILE 0x100 +#define MUI_NON_LANG_NEUTRAL_FILE 0x200 +#define MUI_MACHINE_LANGUAGE_SETTINGS 0x400 +#define MUI_FILETYPE_NOT_LANGUAGE_NEUTRAL 0x001 +#define MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN 0x002 +#define MUI_FILETYPE_LANGUAGE_NEUTRAL_MUI 0x004 +#define MUI_QUERY_TYPE 0x001 +#define MUI_QUERY_CHECKSUM 0x002 +#define MUI_QUERY_LANGUAGE_NAME 0x004 +#define MUI_QUERY_RESOURCE_TYPES 0x008 +#define MUI_FILEINFO_VERSION 0x001 +#define MUI_FULL_LANGUAGE 0x01 +#define MUI_PARTIAL_LANGUAGE 0x02 +#define MUI_LIP_LANGUAGE 0x04 +#define MUI_LANGUAGE_INSTALLED 0x20 +#define MUI_LANGUAGE_LICENSED 0x40 + /* Types */

1 0

Andrew Eikum : gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 1d5914b77784de4118f4df3f6de6c6792b104b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5914b77784de4118f4df3f6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 3 14:26:35 2015 -0500 gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect. We can avoid doing a pre-multiplied alpha conversion by detecting whether we need to perform any graphics operations ahead of time. --- dlls/gdiplus/gdiplus_private.h | 20 +++++++++++++ dlls/gdiplus/graphics.c | 66 ++++++++++++++++++++++++++++-------------- 2 files changed, 65 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d5914b77784de4118f4d…

1 0

Alexandre Julliard : ws2_32: Include wsnwlink.h even without IPX support.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 125b079f6015686d23982ea3e58580758a393cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=125b079f6015686d23982ea3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 4 11:55:32 2015 +0900 ws2_32: Include wsnwlink.h even without IPX support. --- dlls/ws2_32/socket.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 09c8416..d8d724b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -146,6 +146,7 @@ #include "ws2tcpip.h" #include "ws2spi.h" #include "wsipx.h" +#include "wsnwlink.h" #include "wshisotp.h" #include "mstcpip.h" #include "af_irda.h" @@ -157,10 +158,6 @@ #include "wine/exception.h" #include "wine/unicode.h" -#ifdef HAS_IPX -# include "wsnwlink.h" -#endif - #if defined(linux) && !defined(IP_UNICAST_IF) #define IP_UNICAST_IF 50 #endif

1 0

Alexandre Julliard : Wine release 1.7.40
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: website Branch: master Commit: 5029e9d69eacc18b4de8ccd39b4790ef6f6c216f URL: http://source.winehq.org/git/website.git/?a=commit;h=5029e9d69eacc18b4de8cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:58:22 2015 +0900 Wine release 1.7.40 --- news/en/2015040301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2015040301.xml b/news/en/2015040301.xml new file mode 100644 index 0000000..036e32d --- /dev/null +++ b/news/en/2015040301.xml @@ -0,0 +1,18 @@ +<news> +<date>April 3, 2015</date> +<title>Wine 1.7.40 Released</title> +<body> + The Wine development release 1.7.40 is now available. + <a href="{$root}/announce/1.7.40">What's new</a> in this release: +<ul> + <li>Support for kernel job objects.</li> + <li>Various fixes to the ListView control.</li> + <li>Better support for OOB data in Windows Sockets.</li> + <li>Support for DIB images in the OLE data cache.</li> + <li>Improved support for MSI patches.</li> + <li>Some fixes for ACL file permissions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.40.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.40 : Alexandre Julliard : Release 1.7.40
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: refs/tags/wine-1.7.40 Tag: 63539596fdc3c7381b9856dde20c99f740b6d9ae URL: http://source.winehq.org/git/wine.git/?a=tag;h=63539596fdc3c7381b9856dde20c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:56:34 2015 +0900 Release 1.7.40

1 0

Alexandre Julliard : Release 1.7.40.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 22b6a2c01d8551a8fb753bc41eb36ad370840176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b6a2c01d8551a8fb753bc41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:56:33 2015 +0900 Release 1.7.40. --- ANNOUNCE | 865 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 444 insertions(+), 445 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22b6a2c01d8551a8fb753…

1 0

Piotr Caban : advapi32: Handle NULL DACL in SetSecurityInfo.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 52df833a726f3a8132fbdaab00d82dc2b142f005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52df833a726f3a8132fbdaab0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 3 10:04:03 2015 +0200 advapi32: Handle NULL DACL in SetSecurityInfo. --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 71a8c92..2cd3f74 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5743,7 +5743,7 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, SetSecurityDescriptorGroup(&sd, psidGroup, FALSE); if (SecurityInfo & DACL_SECURITY_INFORMATION) { - if (ObjectType == SE_FILE_OBJECT) + if (ObjectType == SE_FILE_OBJECT && pDacl) { SECURITY_DESCRIPTOR_CONTROL control; PSECURITY_DESCRIPTOR psd; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3789d72..466100d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3633,6 +3633,22 @@ static void test_GetNamedSecurityInfoA(void) ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); CloseHandle(h); + /* test setting NULL DACL */ + error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL); + ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + todo_wine ok(!pDacl, "pDacl != NULL\n"); + LocalFree(pSD); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + /* NtSetSecurityObject doesn't inherit DACL entries */ pSD = sd+sizeof(void*)-((ULONG_PTR)sd)%sizeof(void*); InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION);

1 0

Mark Harmstone : winecfg: Add manifest.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 8cf9108b2d5c88e85b55cd5c976fb1f940be0735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf9108b2d5c88e85b55cd5c9… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Apr 2 00:17:18 2015 +0100 winecfg: Add manifest. --- programs/winecfg/winecfg.manifest | 16 ++++++++++++++++ programs/winecfg/winecfg.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/winecfg/winecfg.manifest b/programs/winecfg/winecfg.manifest new file mode 100644 index 0000000..a7e4d88 --- /dev/null +++ b/programs/winecfg/winecfg.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winecfg" version="0.0.0.0" processorArchitecture=""/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 9b8791e..f82159e 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -316,3 +316,6 @@ IDI_LOGO ICON logo.ico /* @makedep: idw_testsound.wav */ IDW_TESTSOUND WAVE idw_testsound.wav + +/* @makedep: winecfg.manifest */ +1 RT_MANIFEST winecfg.manifest

1 0

Sebastian Lackner : ntdll: Fix various bugs RtlUnwindEx on x86_64.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 33c3990e4d5f637807eee55367b9f49f761571ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c3990e4d5f637807eee5536… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 25 15:46:05 2015 +0100 ntdll: Fix various bugs RtlUnwindEx on x86_64. --- dlls/ntdll/signal_x86_64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 551687f..493a9f7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1407,8 +1407,8 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex TRACE( "fde %p len %x personality %p lsda %p code %lx-%lx\n", fde, fde->length, *handler, *handler_data, info.ip, code_end ); execute_cfa_instructions( ptr, end, ip, &info ); - apply_frame_state( context, &info.state ); *frame = context->Rsp; + apply_frame_state( context, &info.state ); TRACE( "next function rip=%016lx\n", context->Rip ); TRACE( " rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", @@ -3214,6 +3214,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } else /* hack: call builtin handlers registered in the tib list */ { + DWORD64 backup_frame = dispatch.EstablisherFrame; while ((ULONG64)teb_frame < new_context.Rsp && (ULONG64)teb_frame < (ULONG64)end_frame) { TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); @@ -3222,10 +3223,10 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec teb_frame = __wine_pop_frame( teb_frame ); } if ((ULONG64)teb_frame == (ULONG64)end_frame && (ULONG64)end_frame < new_context.Rsp) break; - dispatch.EstablisherFrame = new_context.Rsp; + dispatch.EstablisherFrame = backup_frame; } - if (context->Rsp == (ULONG64)end_frame) break; + if (dispatch.EstablisherFrame == (ULONG64)end_frame) break; *context = new_context; }

1 0

Hans Leidekker : wbemprox: Implement more properties of Win32_Processor.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 1f004b34ade39c107796470b83c6d3e116106384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f004b34ade39c107796470b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:19:32 2015 +0200 wbemprox: Implement more properties of Win32_Processor. --- dlls/wbemprox/builtin.c | 55 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 917ae28..e37912e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -148,6 +148,8 @@ static const WCHAR prop_currenthorizontalresW[] = {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_currentverticalresW[] = {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_datawidthW[] = + {'D','a','t','a','W','i','d','t','h',0}; static const WCHAR prop_defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; static const WCHAR prop_descriptionW[] = @@ -494,8 +496,11 @@ static const struct column col_process[] = static const struct column col_processor[] = { { prop_addresswidthW, CIM_UINT16, VT_I4 }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_cpustatusW, CIM_UINT16 }, { prop_currentclockspeedW, CIM_UINT32, VT_I4 }, + { prop_datawidthW, CIM_UINT16, VT_I4 }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_familyW, CIM_UINT16, VT_I4 }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -505,7 +510,8 @@ static const struct column col_processor[] = { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_processortypeW, CIM_UINT16, VT_I4 }, - { prop_uniqueidW, CIM_STRING } + { prop_uniqueidW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_qualifier[] = { @@ -841,8 +847,11 @@ struct record_process struct record_processor { UINT16 addresswidth; + const WCHAR *caption; UINT16 cpu_status; UINT32 currentclockspeed; + UINT16 datawidth; + const WCHAR *description; const WCHAR *device_id; UINT16 family; const WCHAR *manufacturer; @@ -853,6 +862,7 @@ struct record_processor const WCHAR *processor_id; UINT16 processortype; const WCHAR *unique_id; + const WCHAR *version; }; struct record_qualifier { @@ -2086,7 +2096,35 @@ static inline void do_cpuid( unsigned int ax, unsigned int *p ) #endif #endif } +static const WCHAR *get_osarchitecture(void) +{ + SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; + return os_32bitW; +} +static void get_processor_caption( WCHAR *caption ) +{ + static const WCHAR fmtW[] = + {'%','s',' ','F','a','m','i','l','y',' ','%','u',' ', + 'M','o','d','e','l',' ','%','u',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; + static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; + const WCHAR *arch = (get_osarchitecture() == os_32bitW) ? x86W : intel64W; + unsigned int regs[4] = {0, 0, 0, 0}; + do_cpuid( 1, regs ); + sprintfW( caption, fmtW, arch, (regs[0] & (15 << 8)) >> 8, (regs[0] & (15 << 4)) >> 4, regs[0] & 15 ); +} +static void get_processor_version( WCHAR *version ) +{ + static const WCHAR fmtW[] = + {'M','o','d','e','l',' ','%','u',',',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; + unsigned int regs[4] = {0, 0, 0, 0}; + + do_cpuid( 1, regs ); + sprintfW( version, fmtW, (regs[0] & (15 << 4)) >> 4, regs[0] & 15 ); +} static void get_processor_id( WCHAR *processor_id ) { static const WCHAR fmtW[] = {'%','0','8','X','%','0','8','X',0}; @@ -2157,27 +2195,22 @@ static UINT get_processor_maxclockspeed( UINT index ) } return ret; } -static const WCHAR *get_osarchitecture(void) -{ - SYSTEM_INFO info; - GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; - return os_32bitW; -} static enum fill_status fill_processor( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = {'C','P','U','%','u',0}; - WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; + WCHAR caption[100], device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; struct record_processor *rec; UINT i, offset = 0, num_cores, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; + get_processor_caption( caption ); get_processor_id( processor_id ); get_processor_manufacturer( manufacturer ); get_processor_name( name ); + get_processor_version( version ); num_logical_processors = get_logical_processor_count( &num_cores ) / count; num_cores /= count; @@ -2186,8 +2219,11 @@ static enum fill_status fill_processor( struct table *table, const struct expr * { rec = (struct record_processor *)(table->data + offset); rec->addresswidth = get_osarchitecture() == os_32bitW ? 32 : 64; + rec->caption = heap_strdupW( caption ); rec->cpu_status = 1; /* CPU Enabled */ rec->currentclockspeed = get_processor_currentclockspeed( i ); + rec->datawidth = get_osarchitecture() == os_32bitW ? 32 : 64; + rec->description = heap_strdupW( caption ); sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); rec->family = 2; /* Unknown */ @@ -2199,6 +2235,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->processor_id = heap_strdupW( processor_id ); rec->processortype = 3; /* central processor */ rec->unique_id = NULL; + rec->version = heap_strdupW( version ); if (!match_row( table, i, cond, &status )) { free_row_values( table, i );

1 0

Hans Leidekker : wbemprox: Make sure to allocate sufficient memory in resize_table.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 3c5ef7c4ad138ee675520f5a8c325a00a737a352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5ef7c4ad138ee675520f5a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:16:04 2015 +0200 wbemprox: Make sure to allocate sufficient memory in resize_table. --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3548c61..f7a9fc7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1018,10 +1018,10 @@ static BOOL resize_table( struct table *table, UINT row_count, UINT row_size ) table->num_rows_allocated = row_count; return TRUE; } - if (row_count >= table->num_rows_allocated) + if (row_count > table->num_rows_allocated) { BYTE *data; - UINT count = table->num_rows_allocated * 2; + UINT count = max( row_count, table->num_rows_allocated * 2 ); if (!(data = heap_realloc( table->data, count * row_size ))) return FALSE; table->data = data; table->num_rows_allocated = count;

1 0

Nikolay Sivov : dwrite: Fix cluster width and length calculation.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 0c116d773613e433a13b5bcc9eb5d04f4f789f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c116d773613e433a13b5bcc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 3 11:38:23 2015 +0300 dwrite: Fix cluster width and length calculation. --- dlls/dwrite/layout.c | 76 ++++++++++++++++++++++++++++------------------ dlls/dwrite/tests/layout.c | 26 +++++++++++----- 2 files changed, 64 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 28889a7..f28214f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -362,14 +362,34 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos); -static void init_cluster_metrics(const struct layout_run *run, DWRITE_CLUSTER_METRICS *metrics) +static inline DWRITE_LINE_BREAKPOINT get_effective_breakpoint(const struct dwrite_textlayout *layout, UINT32 pos) { + if (layout->actual_breakpoints) + return layout->actual_breakpoints[pos]; + return layout->nominal_breakpoints[pos]; +} + +static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, const struct layout_run *run, + UINT16 start_glyph, UINT16 stop_glyph, UINT32 stop_position, DWRITE_CLUSTER_METRICS *metrics) +{ + UINT8 breakcondition; + UINT16 j; + metrics->width = 0.0; - metrics->length = 1; - metrics->canWrapLineAfter = FALSE; - metrics->isWhitespace = FALSE; - metrics->isNewline = FALSE; - metrics->isSoftHyphen = FALSE; + for (j = start_glyph; j < stop_glyph; j++) + metrics->width += run->run.glyphAdvances[j]; + metrics->length = 0; + + if (stop_glyph == run->run.glyphCount) + breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionAfter; + else + breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionBefore; + + metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || + breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; + metrics->isWhitespace = FALSE; /* FIXME */ + metrics->isNewline = FALSE; /* FIXME */ + metrics->isSoftHyphen = FALSE; /* FIXME */ metrics->isRightToLeft = run->run.bidiLevel & 1; metrics->padding = 0; } @@ -378,42 +398,34 @@ static void init_cluster_metrics(const struct layout_run *run, DWRITE_CLUSTER_ME All clusters in a 'run' will be added to 'layout' data, starting at index pointed to by 'cluster'. On return 'cluster' is updated to point to next metrics struct to be filled in on next call. + Note that there's no need to reallocate anything at this point as we allocate one cluster per + codepoint initially. */ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct layout_run *run, UINT32 *cluster) { DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[*cluster]; - UINT16 glyph; - UINT32 i; - - glyph = run->descr.clusterMap[0]; - init_cluster_metrics(run, metrics); + UINT32 i, start = 0; for (i = 0; i < run->descr.stringLength; i++) { - BOOL newcluster = glyph != run->descr.clusterMap[i]; + BOOL end = i == run->descr.stringLength - 1; - /* add new cluster on starting glyph change or simply when run is over */ - if (newcluster || i == run->descr.stringLength - 1) { - UINT8 breakcondition; - UINT16 j; + if (run->descr.clusterMap[start] != run->descr.clusterMap[i]) { + init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->descr.clusterMap[i], i, metrics); + metrics->length = i - start; - for (j = glyph; j < run->descr.clusterMap[i]; j++) - metrics->width += run->run.glyphAdvances[j]; + *cluster += 1; + metrics++; + start = i; + } - /* FIXME: also set isWhitespace, isNewline and isSoftHyphen */ - breakcondition = newcluster ? layout->nominal_breakpoints[i].breakConditionBefore : - layout->nominal_breakpoints[i].breakConditionAfter; - metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || - breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; + if (end) { + init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->run.glyphCount, i, metrics); + metrics->length = i - start + 1; - /* advance to next cluster */ - glyph = run->descr.clusterMap[i]; *cluster += 1; - metrics++; - init_cluster_metrics(run, metrics); + return; } - else - metrics->length++; } } @@ -583,7 +595,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) } if (hr == S_OK) - layout->clusters_count = cluster + 1; + layout->clusters_count = cluster; IDWriteTextAnalyzer_Release(analyzer); return hr; @@ -613,6 +625,10 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) 0, layout->len, &layout->IDWriteTextAnalysisSink_iface); IDWriteTextAnalyzer_Release(analyzer); } + if (layout->actual_breakpoints) { + heap_free(layout->actual_breakpoints); + layout->actual_breakpoints = NULL; + } hr = layout_compute_runs(layout); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f36c01e..cf0e1f8 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -993,13 +993,13 @@ static void test_GetClusterMetrics(void) { static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; - DWRITE_CLUSTER_METRICS metrics; + DWRITE_CLUSTER_METRICS metrics[4]; IDWriteInlineObject *trimm; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; IDWriteFactory *factory; - UINT32 count; + UINT32 count, i; HRESULT hr; factory = create_factory(); @@ -1016,6 +1016,16 @@ static void test_GetClusterMetrics(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(count == 4, "got %u\n", count); + /* check every cluster width */ + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 4, "got %u\n", count); + for (i = 0; i < count; i++) { + ok(metrics[i].width > 0.0, "%u: got width %.2f\n", i, metrics[i].width); + ok(metrics[i].length == 1, "%u: got length %u\n", i, metrics[i].length); + } + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &trimm); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1033,17 +1043,17 @@ todo_wine count = 0; memset(&metrics, 0, sizeof(metrics)); - hr = IDWriteTextLayout_GetClusterMetrics(layout, &metrics, 1, &count); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 1, &count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); -todo_wine +todo_wine { ok(count == 3, "got %u\n", count); - ok(metrics.length == 2, "got %u\n", metrics.length); - + ok(metrics[0].length == 2, "got %u\n", metrics[0].length); +} hr = IDWriteInlineObject_GetMetrics(trimm, &inline_metrics); todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); - ok(inline_metrics.width == metrics.width, "got %.2f, expected %.2f\n", inline_metrics.width, - metrics.width); + ok(inline_metrics.width == metrics[0].width, "got %.2f, expected %.2f\n", inline_metrics.width, + metrics[0].width); } IDWriteInlineObject_Release(trimm); IDWriteTextLayout_Release(layout);

1 0

Thomas Faber : setupapi/tests: Avoid side-effect in an assert.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 655e7f98dba96bef8db711c5859e271a0c26122c URL: http://source.winehq.org/git/wine.git/?a=commit;h=655e7f98dba96bef8db711c58… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Apr 3 07:55:50 2015 +0200 setupapi/tests: Avoid side-effect in an assert. --- dlls/setupapi/tests/install.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index fdee524..a98cbec 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -63,10 +63,12 @@ static BOOL (WINAPI *pSetupGetInfFileListW)(PCWSTR, DWORD, PWSTR, DWORD, PDWORD) static void create_inf_file(LPCSTR filename, const char *data) { DWORD res; + BOOL ret; HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(handle != INVALID_HANDLE_VALUE); - assert(WriteFile(handle, data, strlen(data), &res, NULL)); + ret = WriteFile(handle, data, strlen(data), &res, NULL); + assert(ret != 0); CloseHandle(handle); }

1 0

Andrew Cook : server: Track handle count of objects.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 5d85f57814f023c105948636094e5e07654605ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d85f57814f023c1059486360… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 10:24:24 2015 +1100 server: Track handle count of objects. --- dlls/ntdll/om.c | 2 +- include/wine/server_protocol.h | 4 ++-- server/handle.c | 23 +++++++++++++++++++---- server/object.c | 10 ++++++---- server/object.h | 1 + server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 8 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index f5f75c6..b337444 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -77,7 +77,7 @@ NTSTATUS WINAPI NtQueryObject(IN HANDLE handle, memset( p, 0, sizeof(*p) ); p->GrantedAccess = reply->access; p->PointerCount = reply->ref_count; - p->HandleCount = 1; /* at least one */ + p->HandleCount = reply->handle_count; if (used_len) *used_len = sizeof(*p); } } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3e61c5c..de6302c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4690,9 +4690,9 @@ struct get_object_info_reply struct reply_header __header; unsigned int access; unsigned int ref_count; + unsigned int handle_count; data_size_t total; /* VARARG(name,unicode_str); */ - char __pad_20[4]; }; @@ -5955,6 +5955,6 @@ union generic_reply struct set_job_completion_port_reply set_job_completion_port_reply; }; -#define SERVER_PROTOCOL_VERSION 465 +#define SERVER_PROTOCOL_VERSION 466 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/handle.c b/server/handle.c index 0293ed6..5043ff7 100644 --- a/server/handle.c +++ b/server/handle.c @@ -97,6 +97,20 @@ static inline obj_handle_t handle_global_to_local( obj_handle_t handle ) return handle ^ HANDLE_OBFUSCATOR; } +/* grab an object and increment its handle count */ +static struct object *grab_object_for_handle( struct object *obj ) +{ + obj->handle_count++; + return grab_object( obj ); +} + +/* release an object and decrement its handle count */ +static void release_object_from_handle( struct object *obj ) +{ + assert( obj->handle_count ); + obj->handle_count--; + release_object( obj ); +} static void handle_table_dump( struct object *obj, int verbose ); static void handle_table_destroy( struct object *obj ); @@ -166,7 +180,7 @@ static void handle_table_destroy( struct object *obj ) { struct object *obj = entry->ptr; entry->ptr = NULL; - if (obj) release_object( obj ); + if (obj) release_object_from_handle( obj ); } free( table->entries ); } @@ -229,7 +243,7 @@ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned table->last = i; found: table->free = i + 1; - entry->ptr = grab_object( obj ); + entry->ptr = grab_object_for_handle( obj ); entry->access = access; return index_to_handle(i); } @@ -355,7 +369,7 @@ struct handle_table *copy_handle_table( struct process *process, struct process for (i = 0; i <= table->last; i++, ptr++) { if (!ptr->ptr) continue; - if (ptr->access & RESERVED_INHERIT) grab_object( ptr->ptr ); + if (ptr->access & RESERVED_INHERIT) grab_object_for_handle( ptr->ptr ); else ptr->ptr = NULL; /* don't inherit this entry */ } } @@ -379,7 +393,7 @@ unsigned int close_handle( struct process *process, obj_handle_t handle ) table = handle_is_global(handle) ? global_table : process->handles; if (entry < table->entries + table->free) table->free = entry - table->entries; if (entry == table->entries + table->last) shrink_handle_table( table ); - release_object( obj ); + release_object_from_handle( obj ); return STATUS_SUCCESS; } @@ -630,6 +644,7 @@ DECL_HANDLER(get_object_info) reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; + reply->handle_count = obj->handle_count; if ((name = get_object_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); diff --git a/server/object.c b/server/object.c index d4afefd..965c11c 100644 --- a/server/object.c +++ b/server/object.c @@ -206,10 +206,11 @@ void *alloc_object( const struct object_ops *ops ) struct object *obj = mem_alloc( ops->size ); if (obj) { - obj->refcount = 1; - obj->ops = ops; - obj->name = NULL; - obj->sd = NULL; + obj->refcount = 1; + obj->handle_count = 0; + obj->ops = ops; + obj->name = NULL; + obj->sd = NULL; list_init( &obj->wait_queue ); #ifdef DEBUG_OBJECTS list_add_head( &object_list, &obj->obj_list ); @@ -306,6 +307,7 @@ void release_object( void *ptr ) assert( obj->refcount ); if (!--obj->refcount) { + assert( !obj->handle_count ); /* if the refcount is 0, nobody can be in the wait queue */ assert( list_empty( &obj->wait_queue )); obj->ops->destroy( obj ); diff --git a/server/object.h b/server/object.h index 3817c75..72b52ee 100644 --- a/server/object.h +++ b/server/object.h @@ -95,6 +95,7 @@ struct object_ops struct object { unsigned int refcount; /* reference count */ + unsigned int handle_count;/* handle count */ const struct object_ops *ops; struct list wait_queue; struct object_name *name; diff --git a/server/protocol.def b/server/protocol.def index 9199c7f..625b3c9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3269,6 +3269,7 @@ enum coords_relative @REPLY unsigned int access; /* granted access mask */ unsigned int ref_count; /* object ref count */ + unsigned int handle_count; /* object handle count */ data_size_t total; /* total needed size for name */ VARARG(name,unicode_str); /* object name */ @END diff --git a/server/request.h b/server/request.h index ba699d1..dd6e4e2 100644 --- a/server/request.h +++ b/server/request.h @@ -2088,7 +2088,8 @@ C_ASSERT( FIELD_OFFSET(struct get_object_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_object_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, access) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, ref_count) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, total) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, handle_count) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, total) == 20 ); C_ASSERT( sizeof(struct get_object_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct unlink_object_request, handle) == 12 ); C_ASSERT( sizeof(struct unlink_object_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index e4188ba..0e2e7e2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3842,6 +3842,7 @@ static void dump_get_object_info_reply( const struct get_object_info_reply *req { fprintf( stderr, " access=%08x", req->access ); fprintf( stderr, ", ref_count=%08x", req->ref_count ); + fprintf( stderr, ", handle_count=%08x", req->handle_count ); fprintf( stderr, ", total=%u", req->total ); dump_varargs_unicode_str( ", name=", cur_size ); }

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_Printer.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 09aec5987019328ec9d6b006a45cd9f1fe4c8d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09aec5987019328ec9d6b006a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:20:27 2015 +0200 wbemprox: Add a partial implementation of Win32_Printer. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 0307e0e..3b17afb 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 +IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index df3bf3f..8ba2642 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -41,6 +41,7 @@ #include "winver.h" #include "sddl.h" #include "ntsecapi.h" +#include "winspool.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -84,6 +85,8 @@ static const WCHAR class_physicalmemoryW[] = {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR class_qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; +static const WCHAR class_printerW[] = + {'W','i','n','3','2','_','P','r','i','n','t','e','r',0}; static const WCHAR class_process_getowner_outW[] = {'_','_','W','I','N','3','2','_','P','R','O','C','E','S','S','_','G','E','T','O','W', 'N','E','R','_','O','U','T',0}; @@ -114,6 +117,8 @@ static const WCHAR prop_adaptertypeW[] = {'A','d','a','p','t','e','r','T','y','p','e',0}; static const WCHAR prop_addresswidthW[] = {'A','d','d','r','e','s','s','W','i','d','t','h',0}; +static const WCHAR prop_attributesW[] = + {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR prop_availabilityW[] = {'A','v','a','i','l','a','b','i','l','i','t','y',0}; static const WCHAR prop_binaryrepresentationW[] = @@ -174,6 +179,8 @@ static const WCHAR prop_domainroleW[] = {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_driveW[] = {'D','r','i','v','e',0}; +static const WCHAR prop_drivernameW[] = + {'D','r','i','v','e','r','N','a','m','e',0}; static const WCHAR prop_driverversionW[] = {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_drivetypeW[] = @@ -188,6 +195,8 @@ static const WCHAR prop_freespaceW[] = {'F','r','e','e','S','p','a','c','e',0}; static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; +static const WCHAR prop_horizontalresolutionW[] = + {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_idW[] = {'I','D',0}; static const WCHAR prop_identificationcodeW[] = @@ -210,6 +219,8 @@ static const WCHAR prop_ipenabledW[] = {'I','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; +static const WCHAR prop_localW[] = + {'L','o','c','a','l',0}; static const WCHAR prop_localdatetimeW[] = {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = @@ -230,6 +241,8 @@ static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; +static const WCHAR prop_networkW[] = + {'N','e','t','w','o','r','k',0}; static const WCHAR prop_numcoresW[] = {'N','u','m','b','e','r','O','f','C','o','r','e','s',0}; static const WCHAR prop_numlogicalprocessorsW[] = @@ -488,6 +501,15 @@ static const struct column col_physicalmemory[] = { { prop_capacityW, CIM_UINT64 } }; +static const struct column col_printer[] = +{ + { prop_attributesW, CIM_UINT32 }, + { prop_drivernameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_horizontalresolutionW, CIM_UINT32 }, + { prop_localW, CIM_BOOLEAN }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_networkW, CIM_BOOLEAN } +}; static const struct column col_process[] = { { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -844,6 +866,15 @@ struct record_physicalmemory { UINT64 capacity; }; +struct record_printer +{ + UINT32 attributes; + const WCHAR *drivername; + UINT32 horizontalresolution; + int local; + const WCHAR *name; + int network; +}; struct record_process { const WCHAR *caption; @@ -2043,6 +2074,51 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e return status; } +static enum fill_status fill_printer( struct table *table, const struct expr *cond ) +{ + struct record_printer *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + PRINTER_INFO_2W *info; + DWORD i, offset = 0, count = 0, size = 0; + + EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; + + if (!(info = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (!EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, (BYTE *)info, size, &size, &count )) + { + heap_free( info ); + return FILL_STATUS_FAILED; + } + if (!resize_table( table, count, sizeof(*rec) )) + { + heap_free( info ); + return FILL_STATUS_FAILED; + } + + for (i = 0; i < count; i++) + { + rec = (struct record_printer *)(table->data + offset); + rec->attributes = info[i].Attributes; + rec->drivername = heap_strdupW( info[i].pDriverName ); + rec->horizontalresolution = info[i].pDevMode->u1.s1.dmPrintQuality; + rec->local = -1; + rec->name = heap_strdupW( info[i].pPrinterName ); + rec->network = 0; + if (!match_row( table, i, cond, &status )) + { + free_row_values( table, i ); + continue; + } + offset += sizeof(*rec); + } + TRACE("created %u rows\n", count); + table->num_rows = count; + + heap_free( info ); + return status; +} + static WCHAR *get_cmdline( DWORD process_id ) { if (process_id == GetCurrentProcessId()) return heap_strdupW( GetCommandLineW() ); @@ -2721,6 +2797,7 @@ static struct table builtin_classes[] = { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, + { class_printerW, SIZEOF(col_printer), col_printer, 0, 0, NULL, fill_printer }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_processor2W, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor },

1 0

Hans Leidekker : wbemprox: Implement more properties of Win32_VideoController.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 64823801fcc15b00d169e494c07852d4af830ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64823801fcc15b00d169e494c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:19:58 2015 +0200 wbemprox: Implement more properties of Win32_VideoController. --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e37912e..df3bf3f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -146,6 +146,10 @@ static const WCHAR prop_currentclockspeedW[] = {'C','u','r','r','e','n','t','C','l','o','c','k','S','p','e','e','d',0}; static const WCHAR prop_currenthorizontalresW[] = {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_currentrefreshrateW[] = + {'C','u','r','r','e','n','t','R','e','f','r','e','s','h','R','a','t','e',0}; +static const WCHAR prop_currentscanmodeW[] = + {'C','u','r','r','e','n','t','S','c','a','n','M','o','d','e',0}; static const WCHAR prop_currentverticalresW[] = {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_datawidthW[] = @@ -316,6 +320,10 @@ static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR prop_videoarchitectureW[] = + {'V','i','d','e','o','A','r','c','h','i','t','e','c','t','u','r','e',0}; +static const WCHAR prop_videomemorytypeW[] = + {'V','i','d','e','o','M','e','m','o','r','y','T','y','p','e',0}; static const WCHAR prop_videoprocessorW[] = {'V','i','d','e','o','P','r','o','c','e','s','s','o','r',0}; static const WCHAR prop_volumenameW[] = @@ -570,14 +578,19 @@ static const struct column col_videocontroller[] = { prop_adapterdactypeW, CIM_STRING }, { prop_adapterramW, CIM_UINT32, VT_I4 }, { prop_availabilityW, CIM_UINT16 }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_currentbitsperpixelW, CIM_UINT32, VT_I4 }, { prop_currenthorizontalresW, CIM_UINT32, VT_I4 }, + { prop_currentrefreshrateW, CIM_UINT32, VT_I4 }, + { prop_currentscanmodeW, CIM_UINT16, VT_I4 }, { prop_currentverticalresW, CIM_UINT32, VT_I4 }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_driverversionW, CIM_STRING }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_videoarchitectureW, CIM_UINT16, VT_I4 }, + { prop_videomemorytypeW, CIM_UINT16, VT_I4 }, { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC } }; @@ -921,14 +934,19 @@ struct record_videocontroller const WCHAR *adapter_dactype; UINT32 adapter_ram; UINT16 availability; + const WCHAR *caption; UINT32 current_bitsperpixel; UINT32 current_horizontalres; + UINT32 current_refreshrate; + UINT16 current_scanmode; UINT32 current_verticalres; const WCHAR *description; const WCHAR *device_id; const WCHAR *driverversion; const WCHAR *name; const WCHAR *pnpdevice_id; + UINT16 videoarchitecture; + UINT16 videomemorytype; const WCHAR *videoprocessor; }; #include "poppack.h" @@ -2659,14 +2677,19 @@ done: rec->adapter_dactype = videocontroller_dactypeW; rec->adapter_ram = vidmem; rec->availability = 3; /* Running or Full Power */ + rec->caption = heap_strdupW( name ); rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); rec->current_horizontalres = hres; + rec->current_refreshrate = 0; /* default refresh rate */ + rec->current_scanmode = 2; /* Unknown */ rec->current_verticalres = vres; rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; rec->driverversion = videocontroller_driverversionW; rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_pnpdeviceid( &desc ); + rec->videoarchitecture = 2; /* Unknown */ + rec->videomemorytype = 2; /* Unknown */ rec->videoprocessor = heap_strdupW( name ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++;

1 0

Francois Gouget : winefile: Remove an unneeded NONAMELESSUNION directive.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 7f977e5d2f80d683a8923061eb06d85a9735f438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f977e5d2f80d683a8923061e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 3 01:25:50 2015 +0200 winefile: Remove an unneeded NONAMELESSUNION directive. --- programs/winefile/winefile.h | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/winefile/winefile.h b/programs/winefile/winefile.h index 60b4aa1..31a1868 100644 --- a/programs/winefile/winefile.h +++ b/programs/winefile/winefile.h @@ -28,7 +28,6 @@ #define NOIMAGE #define NOTAPE -#define NONAMELESSUNION #include <windows.h> #include <commdlg.h>

1 0

Francois Gouget : winhlp32: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: ddcbbb6943b1e202ac55bdb41dec2789f6f54387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcbbb6943b1e202ac55bdb41… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 3 01:25:36 2015 +0200 winhlp32: Remove an unneeded NONAMELESSSTRUCT directive. --- programs/winhlp32/winhelp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 17fe90c..49fdf5d 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -29,7 +29,6 @@ #include <stdlib.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Thomas Faber : winegstreamer: Avoid side-effects in asserts.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: fd8a33fde8b847f38315a28333a612e357f43830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8a33fde8b847f38315a2833… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Apr 3 08:03:51 2015 +0200 winegstreamer: Avoid side-effects in asserts. --- dlls/winegstreamer/gstdemux.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index de48efd..c17fc2f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1074,6 +1074,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *punkout, HRESULT *phr) { static void GST_Destroy(GSTImpl *This) { IPin *connected = NULL; ULONG pinref; + HRESULT hr; TRACE("Destroying\n"); @@ -1082,9 +1083,11 @@ static void GST_Destroy(GSTImpl *This) { /* Don't need to clean up output pins, disconnecting input pin will do that */ IPin_ConnectedTo((IPin *)&This->pInputPin, &connected); if (connected) { - assert(IPin_Disconnect(connected) == S_OK); + hr = IPin_Disconnect(connected); + assert(hr == S_OK); IPin_Release(connected); - assert(IPin_Disconnect((IPin *)&This->pInputPin) == S_OK); + hr = IPin_Disconnect((IPin *)&This->pInputPin); + assert(hr == S_OK); } pinref = IPin_Release((IPin *)&This->pInputPin); if (pinref) {

1 0

Thomas Faber : user32/tests: Avoid side-effect in an assert.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 2885e712f7ef0fcf94a8110326c9df6d84173351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2885e712f7ef0fcf94a811032… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Apr 3 08:02:19 2015 +0200 user32/tests: Avoid side-effect in an assert. --- dlls/user32/tests/win.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6869a20..3a0548d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4883,6 +4883,7 @@ static void test_IsWindowUnicode(void) WNDCLASSA classA; WNDCLASSW classW; HWND hwnd; + ATOM atom; memset(&classW, 0, sizeof(classW)); classW.hInstance = GetModuleHandleA(0); @@ -4894,7 +4895,8 @@ static void test_IsWindowUnicode(void) classA.hInstance = GetModuleHandleA(0); classA.lpfnWndProc = def_window_procA; classA.lpszClassName = ansi_class_nameA; - assert(RegisterClassA(&classA)); + atom = RegisterClassA(&classA); + assert(atom); /* unicode class: window proc */ hwnd = CreateWindowExW(0, unicode_class_nameW, NULL, WS_POPUP,

1 0

Hans Leidekker : wbemprox: Fix a memory leak.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: db6d7dd0600ca6a4dd97f2d6b9c6dff02f32b11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6d7dd0600ca6a4dd97f2d6b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:19:12 2015 +0200 wbemprox: Fix a memory leak. --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f7a9fc7..917ae28 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -361,7 +361,7 @@ static const struct column col_compsys[] = { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 }, - { prop_usernameW, CIM_STRING } + { prop_usernameW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_compsysproduct[] = {

1 0

Shuai Meng : vbscript: Fixed Hex.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 287d419e5e4553dd28bfe6205f5ec5643d8205b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287d419e5e4553dd28bfe6205… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Thu Apr 2 22:20:49 2015 +0800 vbscript: Fixed Hex. --- dlls/vbscript/global.c | 15 +++++++-------- dlls/vbscript/tests/api.vbs | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ee9168b..1a20527 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -544,6 +544,8 @@ static HRESULT Global_Hex(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA { WCHAR buf[17], *ptr; DWORD n; + HRESULT hres; + int ret; TRACE("%s\n", debugstr_variant(arg)); @@ -551,19 +553,16 @@ static HRESULT Global_Hex(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA case VT_I2: n = (WORD)V_I2(arg); break; - case VT_I4: - n = V_I4(arg); - break; - case VT_EMPTY: - n = 0; - break; case VT_NULL: if(res) V_VT(res) = VT_NULL; return S_OK; default: - FIXME("unsupported type %s\n", debugstr_variant(arg)); - return E_NOTIMPL; + hres = to_int(arg, &ret); + if(FAILED(hres)) + return hres; + else + n = ret; } buf[16] = 0; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 7b97df4..2a365c7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -233,10 +233,31 @@ TestHex -1, "FFFF" TestHex -16, "FFF0" TestHex -934859845, "C8472BBB" TestHex empty, "0" +TestHex "17", "11" +TestHex 228.5, "E4" +TestHex -32767, "8001" +TestHex -32768, "FFFF8000" +TestHex 2147483647.49, "7FFFFFFF" +TestHex -2147483647.5, "80000000" +newObject.myval = 30.5 +TestHex newObject, "1E" +newObject.myval = "27" +TestHex newObject, "1B" + Call ok(getVT(hex(null)) = "VT_NULL", "getVT(hex(null)) = " & getVT(hex(null))) Call ok(getVT(hex(empty)) = "VT_BSTR", "getVT(hex(empty)) = " & getVT(hex(empty))) +Sub TestHexError(num, err_num) + On Error Resume Next + Call Hex(num) + Call ok(Err.number = err_num, "Hex(" & num & ") returns error number " & Err.number & " expected " & err_num) +End Sub + +TestHexError 2147483647.5, 6 +TestHexError 2147483648.51, 6 +TestHexError "test", 13 + Sub TestOct(x, ex, res_type) Call ok(Oct(x) = ex, "Oct(" & x & ") = " & Oct(x) & " expected " & ex) Call ok(getVT(Oct(x)) = res_type, "getVT(Oct(" &x & ")) = " & getVT(Oct(x)) & "expected " & res_type)

1 0

Francois Gouget : winedump: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: f635beea751323001b4dd7297584968e7d6c6c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f635beea751323001b4dd7297… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 3 01:25:28 2015 +0200 winedump: Remove unneeded NONAMELESSXXX directives. --- tools/winedump/dos.c | 2 -- tools/winedump/dump.c | 2 -- tools/winedump/font.c | 2 -- tools/winedump/lib.c | 2 +- tools/winedump/msc.c | 2 -- tools/winedump/pdb.c | 2 +- tools/winedump/winedump.h | 2 -- 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/tools/winedump/dos.c b/tools/winedump/dos.c index 8424f79..2ec38b7 100644 --- a/tools/winedump/dos.c +++ b/tools/winedump/dos.c @@ -39,8 +39,6 @@ #endif #include <fcntl.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winedump.h" diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 7ca4dc0..e84e473 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -39,8 +39,6 @@ #endif #include <fcntl.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winedump.h" diff --git a/tools/winedump/font.c b/tools/winedump/font.c index 76710b8..3257fce 100644 --- a/tools/winedump/font.c +++ b/tools/winedump/font.c @@ -35,8 +35,6 @@ #endif #include <fcntl.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index 6c926d4..f593515 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -36,7 +36,7 @@ #include <fcntl.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index bb7a981..5890b29 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -39,8 +39,6 @@ #endif #include <fcntl.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winedump.h" diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 1b713b1..6a6a9b4 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -40,7 +40,7 @@ #include <fcntl.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winedump.h" diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 88fa0e7..339cee3 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -42,8 +42,6 @@ #include <assert.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : shell32: Point the 'My Documents' symbolic link to the XDG or OS X 'Documents' folder if they exist.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: e4c285b0742e8bbeb8c0b744cc7023c985d65dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c285b0742e8bbeb8c0b744c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 3 01:25:04 2015 +0200 shell32: Point the 'My Documents' symbolic link to the XDG or OS X 'Documents' folder if they exist. --- dlls/shell32/shellpath.c | 54 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e184434..cfd3094 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2786,7 +2786,7 @@ static void _SHCreateSymbolicLinks(void) { UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC }, i; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; - static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DESKTOP" }; + static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DOCUMENTS", "DESKTOP" }; static const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; @@ -2809,23 +2809,47 @@ static void _SHCreateSymbolicLinks(void) if (FAILED(hr)) xdg_results = NULL; pszHome = getenv("HOME"); - if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) { - strcpy(szPersonalTarget, pszHome); - if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && - !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) + { + while (1) { - /* '$HOME/My Documents' exists. Create 'My Pictures', 'My Videos' and - * 'My Music' subfolders or fail silently if they already exist. */ - for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); + /* Check if there's already a Wine-specific 'My Documents' folder */ + strcpy(szPersonalTarget, pszHome); + if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && + !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + { + /* '$HOME/My Documents' exists. Create 'My Pictures', + * 'My Videos' and 'My Music' subfolders or fail silently if + * they already exist. + */ + for (i = 0; i < sizeof(aidsMyStuff)/sizeof(*aidsMyStuff); i++) + { + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) + mkdir(szMyStuffTarget, 0777); + } + break; } - } - else - { - /* '$HOME/My Documents' doesn't exists, but '$HOME' does. */ + + /* Try to point to the XDG Documents folder */ + if (xdg_results && xdg_results[num-2] && + !stat(xdg_results[num-2], &statFolder) && + S_ISDIR(statFolder.st_mode)) + { + strcpy(szPersonalTarget, xdg_results[num-2]); + break; + } + + /* Or the hardcoded / OS X Documents folder */ strcpy(szPersonalTarget, pszHome); + if (_SHAppendToUnixPath(szPersonalTarget, DocumentsW) && + !stat(szPersonalTarget, &statFolder) && + S_ISDIR(statFolder.st_mode)) + break; + + /* As a last resort point to $HOME. */ + strcpy(szPersonalTarget, pszHome); + break; } /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */

1 0

Francois Gouget : widl: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 8a63982f73e0ccd8c79b7be33634eae17b1ae808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a63982f73e0ccd8c79b7be33… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 3 01:25:16 2015 +0200 widl: Remove unneeded NONAMELESSXXX directives. --- tools/widl/typelib.c | 3 --- tools/widl/write_msft.c | 1 - 2 files changed, 4 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 8632fdf..6ac748f 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -32,9 +32,6 @@ #include <string.h> #include <ctype.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "windef.h" #include "winbase.h" diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index adffe85..4c85849 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -38,7 +38,6 @@ #include <time.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h"

1 0

Francois Gouget : wineps.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 6027c88cdf8a4ffdded935de6fb70496941871cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6027c88cdf8a4ffdded935de6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:07 2015 +0200 wineps.drv: Mark internal symbols with hidden visibility. --- dlls/wineps.drv/psdrv.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index faefd71..75c062a 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -393,7 +393,7 @@ static inline PSDRV_PDEVICE *get_psdrv_dev( PHYSDEV dev ) * Every glyph name in the Adobe Glyph List and the 35 core PostScript fonts */ -extern const INT PSDRV_AGLGlyphNamesSize; +extern const INT PSDRV_AGLGlyphNamesSize DECLSPEC_HIDDEN; extern GLYPHNAME PSDRV_AGLGlyphNames[] DECLSPEC_HIDDEN; @@ -401,19 +401,19 @@ extern GLYPHNAME PSDRV_AGLGlyphNames[] DECLSPEC_HIDDEN; * The AGL encoding vector */ -extern const INT PSDRV_AGLbyNameSize; /* sorted by name - */ -extern const UNICODEGLYPH PSDRV_AGLbyName[] DECLSPEC_HIDDEN; /* duplicates omitted */ +extern const INT PSDRV_AGLbyNameSize DECLSPEC_HIDDEN; /* sorted by name */ +extern const UNICODEGLYPH PSDRV_AGLbyName[] DECLSPEC_HIDDEN; /* duplicates omitted */ -extern const INT PSDRV_AGLbyUVSize; /* sorted by UV - */ -extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates included */ +extern const INT PSDRV_AGLbyUVSize DECLSPEC_HIDDEN; /* sorted by UV */ +extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates included */ extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; -extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ); -extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ); -extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ); +extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; +extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; +extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,

1 0