wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Andrew Eikum : wineoss.drv: Cap reported OSS fill level to expected level.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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: Do not use out attribute for non-pointer parameters in shdeprecated.idl ( MIDL).
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 6c073fe9a9c1d1e4f342c1babd1ccee9b793d4ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c073fe9a9c1d1e4f342c1bab… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Apr 6 16:07:01 2015 +0200 include: Do not use out attribute for non-pointer parameters in shdeprecated.idl (MIDL). --- include/shdeprecated.idl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index ec05f4f..1f001fd 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -400,8 +400,8 @@ interface IBrowserService2 : IBrowserService LRESULT WndProcBS( [in] HWND hwnd, [in] UINT uMsg, - [in, out] WPARAM wParam, - [in, out] LPARAM lParam); + [in] WPARAM wParam, + [in] LPARAM lParam); HRESULT SetAsDefFolderSettings(); @@ -511,8 +511,8 @@ interface IBrowserService2 : IBrowserService [in] HWND hwndBar, [in] BOOL fBroadcast, [in] UINT uMsg, - [in, out] WPARAM wParam, - [in, out] LPARAM lParam); + [in] WPARAM wParam, + [in] LPARAM lParam); HRESULT GetFolderSetData( [in, out] struct tagFolderSetData *pfsd);

1 0

Thomas Faber : include: Add missing retval attribute to propget output parameters (MIDL).
by Alexandre Julliard 06 Apr '15

06 Apr '15

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

Thomas Faber : include: Use correct UUIDs for IAudioMute, IAudioAutoGainControl and DevTopologyLib (MIDL).
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: b5bbd153d66fc6a2838da9520c7e153163e9a0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5bbd153d66fc6a2838da9520… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Apr 6 15:09:00 2015 +0200 include: Use correct UUIDs for IAudioMute, IAudioAutoGainControl and DevTopologyLib (MIDL). --- include/devicetopology.idl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 74796a2..3ff3027 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -350,7 +350,7 @@ interface IAudioOutputSelector : IUnknown [ pointer_default(unique), nonextensible, - uuid(bb515f69-94a7-429e-8b9c-271b3f11a3ab), + uuid(df45aeea-b74a-4b6b-afad-2366b6aa012e), local, object ] @@ -404,7 +404,7 @@ interface IAudioTreble : IPerChannelDbLevel [ pointer_default(unique), nonextensible, - uuid(bb515f69-94a7-429e-8b9c-271b3f11a3ab), + uuid(85401fd4-6de4-4b9d-9869-2d6753a82f3c), local, object ] @@ -722,6 +722,7 @@ interface IDeviceTopology : IUnknown } [ + uuid(51b9a01d-8181-4363-b59c-e678f476dd0e), version(1.0) ] library DevTopologyLib

1 0

Alexandre Julliard : msvcp60: Merge more I/ O stream code with msvcp90 to reduce the differences.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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

Jacek Caban : wmvcore: Added IWMReaderAdvanced* stub implementation.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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

Nikolay Sivov : scrrun: Implement GetSpecialFolder().
by Alexandre Julliard 06 Apr '15

06 Apr '15

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

Sebastian Lackner : ntoskrnl: Avoid repeated FIXME messages in PsLookupProcessByProcessId.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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 : secur32: Return more context attributes in schan_InitializeSecurityContextW.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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/tests: Add tests for ToAscii.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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

← Newer
1
...
33
34
35
36
37
38
39
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2015