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