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

Alexandre Julliard : include: Avoid IKsPropertySet forward type redefinition.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: ecd350c3ff214bc731f03d30ba743deaf7db82b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd350c3ff214bc731f03d30b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:40:12 2015 +0900 include: Avoid IKsPropertySet forward type redefinition. --- include/dsound.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dsound.h b/include/dsound.h index c7a2bd5..fa23e86 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1138,6 +1138,7 @@ DECLARE_INTERFACE_(IDirectSound3DBuffer,IUnknown) */ #ifndef _IKsPropertySet_ #define _IKsPropertySet_ +#define __IKsPropertySet_FWD_DEFINED__ typedef struct IKsPropertySet *LPKSPROPERTYSET;

1 0

Alexandre Julliard : winebuild: Avoid assigning values outside of the target_cpu enum range.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 109738437749028bacb747984a7fe1271d895691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=109738437749028bacb747984… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 17:25:06 2015 +0900 winebuild: Avoid assigning values outside of the target_cpu enum range. --- tools/winebuild/build.h | 2 +- tools/winebuild/main.c | 7 +++++-- tools/winebuild/parser.c | 2 +- tools/winebuild/utils.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 41cec91..4a71eed 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -262,7 +262,7 @@ extern DLLSPEC *alloc_dll_spec(void); extern void free_dll_spec( DLLSPEC *spec ); extern const char *make_c_identifier( const char *str ); extern const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ); -extern enum target_cpu get_cpu_from_name( const char *name ); +extern int get_cpu_from_name( const char *name ); extern unsigned int get_alignment(unsigned int align); extern unsigned int get_page_size(void); extern unsigned int get_ptr_size(void); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 807cf61..d1717c0 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -199,9 +199,12 @@ static void set_target( const char *target ) if ((p = strchr( spec, '-' ))) { + int cpu; + *p++ = 0; - if ((target_cpu = get_cpu_from_name( spec )) == -1) - fatal_error( "Unrecognized CPU '%s'\n", spec ); + cpu = get_cpu_from_name( spec ); + if (cpu == -1) fatal_error( "Unrecognized CPU '%s'\n", spec ); + target_cpu = cpu; platform = p; if ((p = strrchr( p, '-' ))) platform = p + 1; } diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 0498e75..bae2b47 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -473,7 +473,7 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) odp->flags |= FLAG_CPU_WIN64; else { - enum target_cpu cpu = get_cpu_from_name( cpu_name ); + int cpu = get_cpu_from_name( cpu_name ); if (cpu == -1) { error( "Unknown architecture '%s'\n", cpu_name ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 566911f..b9318c3 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -869,7 +869,7 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) } /* parse a cpu name and return the corresponding value */ -enum target_cpu get_cpu_from_name( const char *name ) +int get_cpu_from_name( const char *name ) { unsigned int i;

1 0

Alexandre Julliard : oledb32/tests: The destination array address can' t be modified by the called function.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 65180fb2e89140a6eb315310163800555e43766d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65180fb2e89140a6eb3153101… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:17:53 2015 +0900 oledb32/tests: The destination array address can't be modified by the called function. --- dlls/oledb32/tests/convert.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b039e11..f7558da 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1346,7 +1346,7 @@ static void test_converttowstr(void) memcpy(src, &IID_IDataConvert, sizeof(GUID)); memset(dst, 0xcc, sizeof(dst)); dst_len = 0x1234; - hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 76, "got %ld\n", dst_len); @@ -1469,17 +1469,15 @@ static void test_converttowstr(void) b = SysAllocStringLen(NULL, 0); V_VT(&v) = VT_BSTR; V_BSTR(&v) = b; - hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 0, "got %ld\n", dst_len); - ok(dst != NULL, "got %p\n", dst); - ok(dst != b, "got %p src %p\n", dst, b); ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); VariantClear(&v); V_VT(&v) = VT_NULL; - hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 0, "got %ld\n", dst_len);

1 0

Alexandre Julliard : shell32/tests: Use NULL for a null pointer.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: d28052066ddc1a8ea1acda1e7f8284970524360d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28052066ddc1a8ea1acda1e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:31:56 2015 +0900 shell32/tests: Use NULL for a null pointer. --- dlls/shell32/tests/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 07e4ee2..6bb28e1 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2429,7 +2429,7 @@ static void test_unicode(void) shfoW.hwnd = NULL; shfoW.wFunc = FO_DELETE; shfoW.pFrom = UNICODE_PATH; - shfoW.pTo = '\0'; + shfoW.pTo = NULL; shfoW.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; shfoW.hNameMappings = NULL; shfoW.lpszProgressTitle = NULL;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 6aa793e269dd8b72944b80630d828df7b3c42fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa793e269dd8b72944b80630… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Mar 3 19:00:21 2015 +0200 po: Update Finnish translation. --- po/fi.po | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6c4918a..700a4df 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2717,22 +2717,17 @@ msgid "" "verify messages signed with it.\n" "Are you sure you want to remove this certificate?" msgstr "" -"Jos jatkat, et voi enää salata viestejä tällä varmenteella tai vahvistaa " +"Jos poistat varmenteen, et voi enää salata sillä viestejä etkä vahvistaa " "sillä allekirjoitettujen viestien aitoutta.\n" -"Haluatko varmasti poistaa varmenteen?" +"Haluatko varmasti poistaa tämän varmenteen?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" "Are you sure you want to remove these certificates?" msgstr "" -"Jos jatkat, et voi enää salata viestejä näillä varmenteilla tai vahvistaa " +"Jos poistat varmenteita, et voi enää salata niillä viestejä etkä vahvistaa " "niillä allekirjoitettujen viestien aitoutta.\n" "Haluatko varmasti poistaa nämä varmenteet?" @@ -3138,10 +3133,8 @@ msgid "&View Source" msgstr "Nä&ytä lähde" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Ominaisuudet" +msgstr "&Ominaisuudet" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -11493,21 +11486,17 @@ msgid "Error: Invalid command line parameters\n" msgstr "Virhe: Viallisia komentoriviparametreja\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Virhe: Etäkoneelle ei voitu lisätä avaimia\n" +msgstr "Virhe: Ei pääsyä etäkoneelle\n" #: reg.rc:38 msgid "" "Error: The system was unable to find the specified registry key or value\n" -msgstr "Virhe: järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "Virhe: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Tyyppiä ei tueta.\n" +msgstr "Virhe: Tyyppiä ei tueta\n" #: regedit.rc:34 msgid "&Registry" @@ -11663,19 +11652,19 @@ msgstr "Muokkaa merkkijonoja" #: regedit.rc:137 msgid "Contains commands for working with the whole registry" -msgstr "Sisältää komentoja koko rekisteriä varten" +msgstr "Sisältää komentoja, joilla voi käsitellä koko rekisteriä" #: regedit.rc:138 msgid "Contains commands for editing values or keys" -msgstr "Sisältää avainten arvojen muokkauskomentoja" +msgstr "Sisältää komentoja, joilla voi muokata avaimia ja arvoja" #: regedit.rc:139 msgid "Contains commands for customizing the registry window" -msgstr "Sisältää rekisteri-ikkunan mukauttamiskomentoja" +msgstr "Sisältää komentoja, joilla voi mukauttaa rekisteri-ikkunaa" #: regedit.rc:140 msgid "Contains commands for accessing frequently used keys" -msgstr "Sisältää komentoja usein käytettyihin avaimiin" +msgstr "Sisältää komentoja, joilla pääsee usein käytettyihin avaimiin" #: regedit.rc:141 msgid ""

1 0

Michael Stefaniuc : crypt32/tests: Add a missing test case (PVS-Studio).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 802c3f2e1f4f452542815ddaa31d79c4df82bb52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=802c3f2e1f4f452542815ddaa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:08:19 2015 +0100 crypt32/tests: Add a missing test case (PVS-Studio). --- dlls/crypt32/tests/chain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 36fc16a..2a26888 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4508,6 +4508,8 @@ static void check_base_policy(void) ignoredInvalidDateBasePolicyCheck, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_BASE, NULL, + ignoredInvalidUsageBasePolicyCheck, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG | CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG;

1 0

Jacek Caban : download.inc.php: Use SourceForge auto-select for all appwiz.cpl downloads from recent Wine.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: tools Branch: master Commit: 19fb458756ee4d96a24ff7926ff28f73f8e308a3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=19fb458756ee4d96a24ff792… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 12:09:02 2015 +0100 download.inc.php: Use SourceForge auto-select for all appwiz.cpl downloads from recent Wine. --- download.inc.php | 15 +++++++++++++++ winegecko.php | 14 -------------- winemono.php | 4 ---- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/download.inc.php b/download.inc.php index 06e5b81..17811a6 100644 --- a/download.inc.php +++ b/download.inc.php @@ -5,6 +5,21 @@ * Copyright (c) 2006 Jonathan Ernst */ +// SourceForge can do better job at redirecting to the mirror than us. However, +// it redirects to HTML page by default for web browser user agents. New enough +// Wine set user agent to 'Wine Addon Downloader', so redirect them directly +// to SourceForge. For older Wine and other user agents, fallback to random +// known mirror. +if(strcmp($_SERVER['HTTP_USER_AGENT'], 'Wine Addon Downloader') === 0) { + header("Location: http://sourceforge.net/projects/wine/files/".$sFileName); + exit; +} + +if(!$iFileSize) { + header("HTTP/1.0 404 Not Found"); + exit; +} + // List of common locations for files $aList += array("http://freefr.dl.sourceforge.net/project/wine/", "http://heanet.dl.sourceforge.net/project/wine/", diff --git a/winegecko.php b/winegecko.php index e44b9e3..0e07406 100644 --- a/winegecko.php +++ b/winegecko.php @@ -48,16 +48,6 @@ default: // Name of the file $sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); -// SourceForge can do better job at redirecting to the mirror than us. However, -// it redirects to HTML page by default for web browser user agents. New enough -// Wine set user agent to 'Wine Addon Downloader', so redirect them directly -// to SourceForge. For older Wine and other user agents, fallback to random -// known mirror. -if(strcmp($_SERVER['HTTP_USER_AGENT'], 'Wine Addon Downloader') === 0) { - header("Location: http://sourceforge.net/projects/wine/files/".$sFileName); - exit; -} - // Size array $aFileSizes = array( '0.0.1'=>5219822, @@ -103,10 +93,6 @@ $aFileSizes = array( // Exact size of the file: $iFileSize = $aFileSizes[$sFileSuffix]; -if(!$iFileSize) { - header("HTTP/1.0 404 Not Found"); - exit; -} // List of additional locations (commonly used locations are already in download.inc.php) $aList = array(); diff --git a/winemono.php b/winemono.php index 3758d0e..a6d7583 100644 --- a/winemono.php +++ b/winemono.php @@ -36,10 +36,6 @@ $aFileSizes = array( // Exact size of the file: $iFileSize = $aFileSizes[$sFileSuffix]; -if(!$iFileSize) { - header("HTTP/1.0 404 Not Found"); - exit; -} // List of additional locations (commonly used locations are already in download.inc.php) $aList = array();

1 0

Nikolay Sivov : rpcrt4: Fix argument check in MesEncodeFixedBufferHandleCreate().
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 37dd44158721d3dc2883418c3cef50ba46f1ae4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37dd44158721d3dc2883418c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 15:18:58 2015 +0300 rpcrt4: Fix argument check in MesEncodeFixedBufferHandleCreate(). --- dlls/rpcrt4/ndr_es.c | 12 ++++++++++++ dlls/rpcrt4/tests/ndr_marshall.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index fa3fe7b..73bd867 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -42,6 +42,7 @@ static inline void init_MIDL_ES_MESSAGE(MIDL_ES_MESSAGE *pEsMsg) /* even if we are unmarshalling, as we don't want pointers to be pointed * to buffer memory */ pEsMsg->StubMsg.IsClient = TRUE; + pEsMsg->MesVersion = 1; } /*********************************************************************** @@ -142,6 +143,17 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( TRACE("(%p, %d, %p, %p)\n", Buffer, BufferSize, pEncodedSize, pHandle); + if (!Buffer) + return RPC_S_INVALID_ARG; + + if (((ULONG_PTR)Buffer % 8) != 0) + return RPC_X_INVALID_BUFFER; + + if (!pEncodedSize) + return RPC_S_INVALID_ARG; + + /* FIXME: check BufferSize too */ + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); if (!pEsMsg) return RPC_S_OUT_OF_MEMORY; diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 1d8a64d..fd1cbbb 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -34,7 +34,7 @@ #include "rpc.h" #include "rpcdce.h" #include "rpcproxy.h" - +#include "midles.h" static int my_alloc_called; static int my_free_called; @@ -2405,6 +2405,42 @@ static void test_NdrGetUserMarshalInfo(void) "NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status); } +static void test_MesEncodeFixedBufferHandleCreate(void) +{ + ULONG encoded_size; + RPC_STATUS status; + handle_t handle; + char *buffer; + + status = MesEncodeFixedBufferHandleCreate(NULL, 0, NULL, NULL); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate(NULL, 0, NULL, &handle); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate((char*)0xdeadbeef, 0, NULL, &handle); + ok(status == RPC_X_INVALID_BUFFER, "got %d\n", status); + + buffer = (void*)((0xdeadbeef + 7) & ~7); + status = MesEncodeFixedBufferHandleCreate(buffer, 0, NULL, &handle); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate(buffer, 0, &encoded_size, &handle); +todo_wine + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); +if (status == RPC_S_OK) + MesHandleFree(handle); + + status = MesEncodeFixedBufferHandleCreate(buffer, 32, NULL, &handle); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesEncodeFixedBufferHandleCreate(buffer, 32, &encoded_size, &handle); + ok(status == RPC_S_OK, "got %d\n", status); + + status = MesHandleFree(handle); + ok(status == RPC_S_OK, "got %d\n", status); +} + START_TEST( ndr_marshall ) { determine_pointer_marshalling_style(); @@ -2425,4 +2461,5 @@ START_TEST( ndr_marshall ) test_ndr_buffer(); test_NdrMapCommAndFaultStatus(); test_NdrGetUserMarshalInfo(); + test_MesEncodeFixedBufferHandleCreate(); }

1 0

Sebastian Lackner : ntdll/tests: Add tests for TpSimpleTryPost function.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: b282a937e2369016fc0fbc84f55f8ab57143ea9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b282a937e2369016fc0fbc84f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 24 05:42:03 2015 +0100 ntdll/tests: Add tests for TpSimpleTryPost function. --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/threadpool.c | 127 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 81b4466..fc352dd 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -21,4 +21,5 @@ C_SRCS = \ rtlbitmap.c \ rtlstr.c \ string.c \ + threadpool.c \ time.c diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c new file mode 100644 index 0000000..2e31b34 --- /dev/null +++ b/dlls/ntdll/tests/threadpool.c @@ -0,0 +1,127 @@ +/* + * Unit test suite for thread pool functions + * + * Copyright 2015 Sebastian Lackner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ntdll_test.h" + +static HMODULE hntdll = 0; +static NTSTATUS (WINAPI *pTpAllocPool)(TP_POOL **,PVOID); +static VOID (WINAPI *pTpReleasePool)(TP_POOL *); +static NTSTATUS (WINAPI *pTpSimpleTryPost)(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); + +#define NTDLL_GET_PROC(func) \ + do \ + { \ + p ## func = (void *)GetProcAddress(hntdll, #func); \ + if (!p ## func) trace("Failed to get address for %s\n", #func); \ + } \ + while (0) + +static BOOL init_threadpool(void) +{ + hntdll = GetModuleHandleA("ntdll"); + if (!hntdll) + { + win_skip("Could not load ntdll\n"); + return FALSE; + } + + NTDLL_GET_PROC(TpAllocPool); + NTDLL_GET_PROC(TpReleasePool); + NTDLL_GET_PROC(TpSimpleTryPost); + + if (!pTpAllocPool) + { + skip("Threadpool functions not supported, skipping tests\n"); + return FALSE; + } + + return TRUE; +} + +#undef NTDLL_GET_PROC + + +static void CALLBACK simple_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) +{ + HANDLE semaphore = userdata; + trace("Running simple callback\n"); + ReleaseSemaphore(semaphore, 1, NULL); +} + +static void test_tp_simple(void) +{ + TP_CALLBACK_ENVIRON environment; + HANDLE semaphore; + NTSTATUS status; + TP_POOL *pool; + DWORD result; + + semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + + /* post the callback using the default threadpool */ + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = NULL; + status = pTpSimpleTryPost(simple_cb, semaphore, &environment); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + /* allocate new threadpool */ + pool = NULL; + status = pTpAllocPool(&pool, NULL); + ok(!status, "TpAllocPool failed with status %x\n", status); + ok(pool != NULL, "expected pool != NULL\n"); + + /* post the callback using the new threadpool */ + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + status = pTpSimpleTryPost(simple_cb, semaphore, &environment); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + /* test with invalid version number */ + memset(&environment, 0, sizeof(environment)); + environment.Version = 9999; + environment.Pool = pool; + status = pTpSimpleTryPost(simple_cb, semaphore, &environment); + ok(status == STATUS_INVALID_PARAMETER || broken(!status) /* Vista/2008 */, + "TpSimpleTryPost unexpectedly returned status %x\n", status); + if (!status) + { + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } + + /* cleanup */ + pTpReleasePool(pool); + CloseHandle(semaphore); +} + +START_TEST(threadpool) +{ + if (!init_threadpool()) + return; + + test_tp_simple(); +}

1 0

Mark Harmstone : comctl32: Paint themed scrollbars.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: d7c206972175f8b2eee90358e8c3f12c9973285b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c206972175f8b2eee90358e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 07:44:42 2015 +0000 comctl32: Paint themed scrollbars. --- dlls/comctl32/theme_scrollbar.c | 231 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index ed2c051..9be8384 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -32,8 +32,232 @@ #include "comctl32.h" #include "wine/debug.h" +/* Minimum size of the thumb in pixels */ +#define SCROLL_MIN_THUMB 6 + +/* Minimum size of the rectangle between the arrows */ +#define SCROLL_MIN_RECT 4 + WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); +static void calc_thumb_dimensions(unsigned int size, SCROLLINFO *si, unsigned int *thumbpos, unsigned int *thumbsize) +{ + if (size <= SCROLL_MIN_RECT) + *thumbpos = *thumbsize = 0; + else if (si->nPage > si->nMax - si->nMin) + *thumbpos = *thumbsize = 0; + else { + if (si->nPage > 0) { + *thumbsize = MulDiv(size, si->nPage, si->nMax - si->nMin + 1); + if (*thumbsize < SCROLL_MIN_THUMB) *thumbsize = SCROLL_MIN_THUMB; + } + else *thumbsize = GetSystemMetrics(SM_CXVSCROLL); + + if (size < *thumbsize) + *thumbpos = *thumbsize = 0; + else { + int max = si->nMax - max(si->nPage - 1, 0); + size -= *thumbsize; + if (si->nMin >= max) + *thumbpos = 0; + else + *thumbpos = MulDiv(size, si->nTrackPos - si->nMin, max - si->nMin); + } + } +} + +static void paint_scrollbar(HWND hwnd, HTHEME theme) +{ + HDC dc; + PAINTSTRUCT ps; + RECT r; + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + BOOL vertical = style & SBS_VERT; + BOOL disabled = !IsWindowEnabled(hwnd); + + GetWindowRect(hwnd, &r); + OffsetRect(&r, -r.left, -r.top); + + dc = BeginPaint(hwnd, &ps); + + if (style & SBS_SIZEBOX || style & SBS_SIZEGRIP) { + int state; + + if (style & SBS_SIZEBOXTOPLEFTALIGN) + state = SZB_TOPLEFTALIGN; + else + state = SZB_RIGHTALIGN; + + DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, &r, NULL); + } else { + SCROLLBARINFO sbi; + SCROLLINFO si; + unsigned int thumbpos, thumbsize; + int uppertrackstate, lowertrackstate, thumbstate; + RECT partrect, trackrect; + SIZE grippersize; + + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(hwnd, OBJID_CLIENT, &sbi); + + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + GetScrollInfo(hwnd, SB_CTL, &si); + + trackrect = r; + + if (disabled) { + uppertrackstate = SCRBS_DISABLED; + lowertrackstate = SCRBS_DISABLED; + thumbstate = SCRBS_DISABLED; + } else { + uppertrackstate = SCRBS_NORMAL; + lowertrackstate = SCRBS_NORMAL; + thumbstate = SCRBS_NORMAL; + } + + if (vertical) { + SIZE upsize, downsize; + int uparrowstate, downarrowstate; + + if (disabled) { + uparrowstate = ABS_UPDISABLED; + downarrowstate = ABS_DOWNDISABLED; + } else { + uparrowstate = ABS_UPNORMAL; + downarrowstate = ABS_DOWNNORMAL; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, uparrowstate, NULL, TS_DRAW, &upsize))) { + WARN("Could not get up arrow size.\n"); + return; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, downarrowstate, NULL, TS_DRAW, &downsize))) { + WARN("Could not get down arrow size.\n"); + return; + } + + if (r.bottom - r.top - upsize.cy - downsize.cy < SCROLL_MIN_RECT) + upsize.cy = downsize.cy = (r.bottom - r.top - SCROLL_MIN_RECT)/2; + + partrect = r; + partrect.bottom = partrect.top + upsize.cy; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, uparrowstate, &partrect, NULL); + + trackrect.top = partrect.bottom; + + partrect.bottom = r.bottom; + partrect.top = partrect.bottom - downsize.cy; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, downarrowstate, &partrect, NULL); + + trackrect.bottom = partrect.top; + + calc_thumb_dimensions(trackrect.bottom - trackrect.top, &si, &thumbpos, &thumbsize); + + if (thumbpos > 0) { + partrect.top = trackrect.top; + partrect.bottom = partrect.top + thumbpos; + + DrawThemeBackground(theme, dc, SBP_UPPERTRACKVERT, uppertrackstate, &partrect, NULL); + } + + if (thumbsize > 0) { + partrect.top = trackrect.top + thumbpos; + partrect.bottom = partrect.top + thumbsize; + + DrawThemeBackground(theme, dc, SBP_THUMBBTNVERT, thumbstate, &partrect, NULL); + + if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERVERT, thumbstate, NULL, TS_DRAW, &grippersize))) { + MARGINS margins; + + if (SUCCEEDED(GetThemeMargins(theme, dc, SBP_THUMBBTNVERT, thumbstate, TMT_CONTENTMARGINS, &partrect, &margins))) { + if (grippersize.cy <= (thumbsize - margins.cyTopHeight - margins.cyBottomHeight)) + DrawThemeBackground(theme, dc, SBP_GRIPPERVERT, thumbstate, &partrect, NULL); + } + } + } + + if (thumbpos + thumbsize < trackrect.bottom - trackrect.top) { + partrect.bottom = trackrect.bottom; + partrect.top = trackrect.top + thumbsize + thumbpos; + + DrawThemeBackground(theme, dc, SBP_LOWERTRACKVERT, lowertrackstate, &partrect, NULL); + } + } else { + SIZE leftsize, rightsize; + int leftarrowstate, rightarrowstate; + + if (disabled) { + leftarrowstate = ABS_LEFTDISABLED; + rightarrowstate = ABS_RIGHTDISABLED; + } else { + leftarrowstate = ABS_LEFTNORMAL; + rightarrowstate = ABS_RIGHTNORMAL; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, leftarrowstate, NULL, TS_DRAW, &leftsize))) { + WARN("Could not get left arrow size.\n"); + return; + } + + if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, rightarrowstate, NULL, TS_DRAW, &rightsize))) { + WARN("Could not get right arrow size.\n"); + return; + } + + if (r.right - r.left - leftsize.cx - rightsize.cx < SCROLL_MIN_RECT) + leftsize.cx = rightsize.cx = (r.right - r.left - SCROLL_MIN_RECT)/2; + + partrect = r; + partrect.right = partrect.left + leftsize.cx; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, leftarrowstate, &partrect, NULL); + + trackrect.left = partrect.right; + + partrect.right = r.right; + partrect.left = partrect.right - rightsize.cx; + DrawThemeBackground(theme, dc, SBP_ARROWBTN, rightarrowstate, &partrect, NULL); + + trackrect.right = partrect.left; + + calc_thumb_dimensions(trackrect.right - trackrect.left, &si, &thumbpos, &thumbsize); + + if (thumbpos > 0) { + partrect.left = trackrect.left; + partrect.right = partrect.left + thumbpos; + + DrawThemeBackground(theme, dc, SBP_UPPERTRACKHORZ, uppertrackstate, &partrect, NULL); + } + + if (thumbsize > 0) { + partrect.left = trackrect.left + thumbpos; + partrect.right = partrect.left + thumbsize; + + DrawThemeBackground(theme, dc, SBP_THUMBBTNHORZ, thumbstate, &partrect, NULL); + + if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERHORZ, thumbstate, NULL, TS_DRAW, &grippersize))) { + MARGINS margins; + + if (SUCCEEDED(GetThemeMargins(theme, dc, SBP_THUMBBTNHORZ, thumbstate, TMT_CONTENTMARGINS, &partrect, &margins))) { + if (grippersize.cx <= (thumbsize - margins.cxLeftWidth - margins.cxRightWidth)) + DrawThemeBackground(theme, dc, SBP_GRIPPERHORZ, thumbstate, &partrect, NULL); + } + } + } + + if (thumbpos + thumbsize < trackrect.right - trackrect.left) { + partrect.right = trackrect.right; + partrect.left = trackrect.left + thumbsize + thumbpos; + + DrawThemeBackground(theme, dc, SBP_LOWERTRACKHORZ, lowertrackstate, &partrect, NULL); + } + } + } + + EndPaint(hwnd, &ps); +} + LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, ULONG_PTR dwRefData) @@ -68,6 +292,13 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, * which will do the repaint. */ break; + case WM_PAINT: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + paint_scrollbar(hwnd, theme); + break; + default: return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); }

1 0