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

Sebastian Lackner : user32: Check for NULL pointer in ToUnicodeEx.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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

Sebastian Lackner : user32/tests: Add tests for ToUnicodeEx with a NULL pointer as keystate.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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

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

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 : 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

Alexandre Julliard : ws2_32: Include wsnwlink.h even without IPX support.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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

Andrew Eikum : gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect.
by Alexandre Julliard 06 Apr '15

06 Apr '15

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 : Wine release 1.7.40
by Alexandre Julliard 03 Apr '15

03 Apr '15

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

Alexandre Julliard : Release 1.7.40.
by Alexandre Julliard 03 Apr '15

03 Apr '15

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

Tag wine-1.7.40 : Alexandre Julliard : Release 1.7.40
by Alexandre Julliard 03 Apr '15

03 Apr '15

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