June 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : wordpad: Don't offer vertical fonts in the font dialog .
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: fb6b0f93c2493aed23d17c27c05b7f64c7c66702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6b0f93c2493aed23d17c27c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:39:41 2013 +0200 wordpad: Don't offer vertical fonts in the font dialog. --- programs/wordpad/wordpad.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8a2afc4..8468148 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -576,7 +576,7 @@ static void dialog_choose_font(void) cf.lStructSize = sizeof(cf); cf.hwndOwner = hMainWnd; cf.lpLogFont = &lf; - cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS; + cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS | CF_NOVERTFONTS; ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); @@ -619,6 +619,8 @@ static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lp { HWND hListWnd = (HWND) lParam; + if (lpelfe->lfFaceName[0] == '@') return 1; /* ignore vertical fonts */ + if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR) {

1 0

Hans Leidekker : dssenh/tests: Fix test failures on 64-bit Vista.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: 725797249c0efec82261ecc9ee1bc1c51c6e87f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725797249c0efec82261ecc9e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 25 12:46:39 2013 +0200 dssenh/tests: Fix test failures on 64-bit Vista. --- dlls/dssenh/tests/dssenh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index bf79407..c873787 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1142,6 +1142,7 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ /* Import the public key and convert it into a shared key */ result = CryptImportKey(hProv, pubKeyBuffer2, pubKeyLen2, privKey1, 0, &sessionKey1); ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || + broken(!result && GetLastError() == NTE_BAD_DATA) || /* Vista.64 */ broken(!result && GetLastError() == NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */ broken(!result && GetLastError() == NTE_BAD_ALGID) || /* W7SP164 (32 bit dssenh) */ broken(result), /* WinNT4 */

1 0

Hans Leidekker : winhttp/tests: Add some tests for WinHttpDetectAutoProxyConfigUrl.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: d285629cf4fcf5521a0fb5086ceddc010bfc4e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d285629cf4fcf5521a0fb5086… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 25 12:46:55 2013 +0200 winhttp/tests: Add some tests for WinHttpDetectAutoProxyConfigUrl. --- dlls/winhttp/tests/winhttp.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2f1df0f..6b946a9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2679,12 +2679,30 @@ if (0) /* crashes on some win2k systems */ ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } - url = NULL; + url = (WCHAR *)0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url ); error = GetLastError(); if (!ret) + { ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + } + else + { + trace("%s\n", wine_dbgstr_w(url)); + GlobalFree( url ); + } + + url = (WCHAR *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DHCP, &url ); + error = GetLastError(); + if (!ret) + { + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + } else { trace("%s\n", wine_dbgstr_w(url));

1 0

Piotr Caban : msvcrt: Added _wcsicmp_l implementation.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: c66d94bfd949b997f7488c6fa3d2e00d2b5f1dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66d94bfd949b997f7488c6fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 25 16:14:23 2013 +0200 msvcrt: Added _wcsicmp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8e728c1..9479d5e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1484,7 +1484,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7b43159..b83bfe0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1847,7 +1847,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2344f0f..b8118a9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1162,7 +1162,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e31da91..8467b91 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1138,7 +1138,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index afb12bf..e12d87f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1102,7 +1102,7 @@ @ cdecl _wcserror_s(ptr long long) # stub _wcsftime_l(ptr long wstr ptr ptr) @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp -# stub _wcsicmp_l(wstr wstr ptr) +@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l @ cdecl _wcslwr(wstr) ntdll._wcslwr diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a5795bd..c5b630f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -69,6 +69,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) return ret; } +INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT__locale_t locale) +{ + if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) + return MSVCRT__NLSCMPERROR; + + return strcmpiW(str1, str2); +} + /********************************************************************* * _wcsicmp (MSVCRT.@) */

1 0

Hans Leidekker : ws2_32/tests: Avoid races.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: 1d8b70fca4224f324f878b286c3178a313e3aef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8b70fca4224f324f878b286… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 25 12:46:10 2013 +0200 ws2_32/tests: Avoid races. --- dlls/ws2_32/tests/sock.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 758fa7e..3e3167a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5468,6 +5468,8 @@ static void test_completion_port(void) ok(iret == SOCKET_ERROR, "WSARecv returned %d\n", iret); ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + Sleep(100); + closesocket(src); src = INVALID_SOCKET; @@ -5523,6 +5525,9 @@ static void test_completion_port(void) closesocket(src); src = INVALID_SOCKET; + + Sleep(100); + num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -5947,6 +5952,8 @@ static void test_completion_port(void) iret = send(connector, buf, 1, 0); ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + Sleep(100); + closesocket(dest); dest = INVALID_SOCKET; @@ -6022,12 +6029,15 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok((GetLastError() == ERROR_NETNAME_DELETED) || (GetLastError() == ERROR_CONNECTION_ABORTED), "Last error was %d\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED || + GetLastError() == ERROR_OPERATION_ABORTED || + GetLastError() == ERROR_CONNECTION_ABORTED, "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && ((olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT) - || (olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED)), "Internal status is %lx\n", olp ? olp->Internal : 0); + todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT || + olp->Internal == (ULONG)STATUS_CANCELLED || + olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef;

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: 031c4e2d0e1f36b0f91ded0b353d280edfd6d35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c4e2d0e1f36b0f91ded0b3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 25 00:36:51 2013 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 517410a..6ad9576 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1985,7 +1985,7 @@ msgstr "Assinatura de Certificados" #: crypt32.rc:227 msgid "Off-line CRL Signing" -msgstr "Assinatura CRL Off-line" +msgstr "Assinatura CRL Offline" #: crypt32.rc:228 msgid "CRL Signing" @@ -3505,7 +3505,7 @@ msgstr "Argumento ou chamada de procedimento inválida" #: jscript.rc:27 msgid "Subscript out of range" -msgstr "Subscript fora de alcance" +msgstr "Índice fora do intervalo" #: jscript.rc:28 msgid "Object required" @@ -4373,7 +4373,7 @@ msgstr "Chamador não possui o Mutex.\n" #: winerror.mc:946 msgid "Too many posts to semaphore.\n" -msgstr "Demasiados posts ao semáforo.\n" +msgstr "Muitas mensagens ao semáforo.\n" #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed.\n" @@ -4381,11 +4381,11 @@ msgstr "Read/WriteProcessMemory parcialmente completo.\n" #: winerror.mc:956 msgid "The oplock wasn't granted.\n" -msgstr "O oplock não foi garantido.\n" +msgstr "O bloqueio não foi garantido.\n" #: winerror.mc:961 msgid "Invalid oplock message received.\n" -msgstr "Mensagem inválida de oplock recebida.\n" +msgstr "Mensagem inválida de bloqueio recebida.\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" @@ -4777,7 +4777,7 @@ msgstr "Memória do servidor insuficiente.\n" #: winerror.mc:1451 msgid "Possible deadlock.\n" -msgstr "Possível deadlock.\n" +msgstr "Possível bloqueio.\n" #: winerror.mc:1456 msgid "Incorrect alignment.\n" @@ -9343,7 +9343,7 @@ msgstr "" "\n" " + Define um atributo.\n" " - Limpa um atributo.\n" -" R Atributo de arquivo somente-leitura.\n" +" R Atributo de arquivo somente leitura.\n" " A Atributo de arquivo.\n" " S Atributo de arquivo de sistema.\n" " H Atribute de arquivo oculto.\n" @@ -9764,7 +9764,7 @@ msgstr "" "\"title\" Especifica o título da janela da janela filha.\n" "/d directory Inicia o programa no diretório especificado.\n" "/b Não criar um console novo para o programa.\n" -"/i Inicia o programa com variáveis de ambinete novas.\n" +"/i Inicia o programa com variáveis de ambiente novas.\n" "/min Inicia o programa minimizado.\n" "/max Inicia o programa maximizado.\n" "/low Inicia o programa com prioridade baixa.\n" @@ -10196,7 +10196,7 @@ msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"Número mal-formado - deve ser decimal (12),\n" +"Número malformado - deve ser decimal (12),\n" " hexadecimal (0x34) ou octal (056).\n" #: dxdiag.rc:27 @@ -11534,7 +11534,7 @@ msgstr "Editar Multi-frase" #: regedit.rc:134 msgid "Contains commands for working with the whole registry" -msgstr "Contém comandos para trabalhar com o Registro inteiro" +msgstr "Contém comandos para trabalhar com o registro inteiro" #: regedit.rc:135 msgid "Contains commands for editing values or keys"

1 0

Alexandre Julliard : wineconsole: Don' t offer vertical fonts in the font dialog.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: ed853f93d40d342cc8cf33f7fe61a9739f36d294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed853f93d40d342cc8cf33f7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 18:07:24 2013 +0200 wineconsole: Don't offer vertical fonts in the font dialog. --- programs/wineconsole/user.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 9b8ad15..5c8c2c0 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -357,6 +357,7 @@ BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf) { return (lf->lfPitchAndFamily & 3) == FIXED_PITCH && /* (lf->lfPitchAndFamily & 0xF0) == FF_MODERN && */ + lf->lfFaceName[0] != '@' && (lf->lfCharSet == DEFAULT_CHARSET || lf->lfCharSet == g_uiDefaultCharset); }

1 0

Dmitry Timoshkov : kernel32/tests: Add more VirtualAlloc and VirtualProtect tests.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: c69cc5506bd0507c1247311ab58425d97fa21168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69cc5506bd0507c1247311ab… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 25 14:43:49 2013 +0900 kernel32/tests: Add more VirtualAlloc and VirtualProtect tests. --- dlls/kernel32/tests/virtual.c | 69 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index c0c1a89..521ce6e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1581,7 +1581,7 @@ static void test_VirtualProtect(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0xe0 */ { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 } /* 0xf0 */ }; - char *base; + char *base, *ptr; DWORD ret, old_prot, rw_prot, exec_prot, i, j; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; @@ -1652,6 +1652,27 @@ static void test_VirtualProtect(void) DWORD prot = exec_prot | rw_prot; SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, prot); + if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) + { + ok(!ptr, "VirtualAlloc(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + { + if (prot & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY)) + { + ok(!ptr, "VirtualAlloc(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + { + ok(ptr != NULL, "VirtualAlloc(%02x) error %d\n", prot, GetLastError()); + ok(ptr == base, "expected %p, got %p\n", base, ptr); + } + } + + SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, prot, &old_prot); if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) { @@ -1734,7 +1755,7 @@ static void test_VirtualAlloc_protection(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE }, /* 0xe0 */ { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE } /* 0xf0 */ }; - char *base; + char *base, *ptr; DWORD ret, i; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; @@ -1772,6 +1793,10 @@ static void test_VirtualAlloc_protection(void) ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); } + SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); + ok(ptr == base, "%d: VirtualAlloc failed %d\n", i, GetLastError()); + VirtualFree(base, 0, MEM_FREE); } else @@ -1824,7 +1849,7 @@ static void test_CreateFileMapping_protection(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE, PAGE_NOACCESS }, /* 0xe0 */ { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE, PAGE_NOACCESS } /* 0xf0 */ }; - char *base; + char *base, *ptr; DWORD ret, i, alloc_prot, prot, old_prot; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; @@ -1896,6 +1921,27 @@ static void test_CreateFileMapping_protection(void) ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); } + SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); + /* FIXME: remove once Wine is fixed */ + if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) + ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); + else +todo_wine + ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + ret = VirtualProtect(base, si.dwPageSize, td[i].prot, &old_prot); + if (td[i].prot == PAGE_READONLY || td[i].prot == PAGE_WRITECOPY) + ok(ret, "%d: VirtualProtect(%02x) error %d\n", i, td[i].prot, GetLastError()); + else + { + ok(!ret, "%d: VirtualProtect(%02x) should fail\n", i, td[i].prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + UnmapViewOfFile(base); CloseHandle(hmap); } @@ -2196,7 +2242,7 @@ static void test_mapping(void) { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE, PAGE_EXECUTE_READWRITE }, /* 0x2e */ { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE | FILE_MAP_COPY, PAGE_EXECUTE_READWRITE } /* 0x2f */ }; - void *base, *nt_base; + void *base, *nt_base, *ptr; DWORD i, j, k, ret, old_prot, prev_prot; SYSTEM_INFO si; char temp_path[MAX_PATH]; @@ -2376,6 +2422,21 @@ static void test_mapping(void) } } + for (k = 0; k < sizeof(page_prot)/sizeof(page_prot[0]); k++) + { + /*trace("map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]);*/ + SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, page_prot[k]); + /* FIXME: remove once Wine is fixed */ + if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); + else +todo_wine + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + } + UnmapViewOfFile(base); }

1 0

André Hentschel : oleaut32/tests: Don' t use autoheader styled define in vartest.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: a58e9f0312f200a657dcd16235f75898acd1306b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58e9f0312f200a657dcd1623… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 24 22:02:25 2013 +0200 oleaut32/tests: Don't use autoheader styled define in vartest. --- dlls/oleaut32/tests/vartest.c | 282 ++++++++++++++++++++--------------------- 1 files changed, 138 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a58e9f0312f200a657dcd…

1 0

Stefan Leichter : msvcp100/tests: Fix dynamically loaded functions for platform arm.
by Alexandre Julliard June 25, 2013

June 25, 2013

Module: wine Branch: master Commit: 34c5acdd4e53e8d458b6b026f4771808769255bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c5acdd4e53e8d458b6b026f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jun 24 21:44:28 2013 +0200 msvcp100/tests: Fix dynamically loaded functions for platform arm. --- dlls/msvcp100/tests/misc.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 89933d0..47f6410 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -111,12 +111,21 @@ static BOOL init(void) SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ"); SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z"); }else { +#ifdef __arm__ + SET(p__Container_base12_copy_ctor, "??0_Container_base12(a)std@@QAA(a)ABU01@@Z"); + SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QAE(a)XZ"); + SET(p__Container_base12__Orphan_all, "?_Orphan_all(a)_Container_base12@std@@QAAXXZ"); + SET(p__Container_base12_dtor, "??1_Container_base12(a)std@@QAA(a)XZ"); + SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QBAPAPAU_Iterator_base12(a)2@XZ"); + SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QAAXAAU12@@Z"); +#else SET(p__Container_base12_copy_ctor, "??0_Container_base12(a)std@@QAE(a)ABU01@@Z"); SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QAE(a)XZ"); SET(p__Container_base12__Orphan_all, "?_Orphan_all(a)_Container_base12@std@@QAEXXZ"); SET(p__Container_base12_dtor, "??1_Container_base12(a)std@@QAE(a)XZ"); SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ"); SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z"); +#endif /* __arm__ */ } init_thiscall_thunk();

1 0