January 2016 - Wine-Commits

Jeremy Newman : added new crossover logo for download page
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 30b8d9f25d9cb563fa32cd582ab6de53dc82e7b0 URL: http://source.winehq.org/git/website.git/?a=commit;h=30b8d9f25d9cb563fa32cd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:43:43 2016 -0600 added new crossover logo for download page --- images/distro/crossover_swoosh.png | Bin 0 -> 23210 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/distro/crossover_swoosh.png b/images/distro/crossover_swoosh.png new file mode 100644 index 0000000..5d03e09 Binary files /dev/null and b/images/distro/crossover_swoosh.png differ

1 0

Jeremy Newman : update README for new translation instructions and requirements
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 095c1f0055ea48b604b16758e6a53991f50aa1b7 URL: http://source.winehq.org/git/website.git/?a=commit;h=095c1f0055ea48b604b167… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:40:48 2016 -0600 update README for new translation instructions and requirements --- README | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README b/README index 6cb89bb..6e8761f 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ WineHQ (lostwages) Website Template Engine -ver 3.0 +ver 4.0 by Jeremy Newman <jnewman(a)codeweavers.com> ----------------------------------------------------------------------- Installation Requirements: * Apache 2.0 or higher * mod_rewrite enabled in Apache config - * PHP 5.3 or higher + * PHP 5.4 or higher Setting Up: ----------------------------------------------------------------------- @@ -38,6 +38,16 @@ The following varables can be used in templates. You can also add global vars to include/globals.conf and they will be availbe as {$config_[key]} where [key] is the name you defined in globals.conf +Translating: +----------------------------------------------------------------------- +1. Edit include/winehq.conf and add your language code to @languages. +2. Create language subdir in templates. +4. Add your language strings to templates/en/global/xml/trans/lang.xml +5. Copy and edit path templates/en/global/xml/trans/global.xml to your + langs subdir. +6. Copy individual templates/en/*.template to your langs subdir as you + translate them. Only copy the files you plan on translating. +7. News item translations are in news/<lang>. Notes: -----------------------------------------------------------------------

1 0

Jeremy Newman : remove to be re-translated
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: b325cd93f23fbc5cdeef310004c6936e0827621c URL: http://source.winehq.org/git/website.git/?a=commit;h=b325cd93f23fbc5cdeef31… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:14:58 2016 -0600 remove to be re-translated --- templates/de/global/themes/winehq/content.template | 72 --------------------- .../de/global/themes/winehq/content_nobox.template | 74 ---------------------- templates/fr/global/themes/winehq/content.template | 71 --------------------- .../fr/global/themes/winehq/content_nobox.template | 73 --------------------- templates/tr/global/themes/winehq/content.template | 71 --------------------- .../tr/global/themes/winehq/content_nobox.template | 73 --------------------- .../tr/global/themes/winehq/content_print.template | 18 ------ templates/uk/global/themes/winehq/content.template | 71 --------------------- .../uk/global/themes/winehq/content_nobox.template | 73 --------------------- .../uk/global/themes/winehq/content_print.template | 18 ------ 10 files changed, 614 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=b325cd93f23fbc5cde…

1 0

Jeremy Newman : update home page translations for new theme
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 28c604f2c37c96589e0363d1d6acd6806a63a2a9 URL: http://source.winehq.org/git/website.git/?a=commit;h=28c604f2c37c96589e0363… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:14:42 2016 -0600 update home page translations for new theme --- templates/de/home.template | 139 ++++++++++++++++++++++--------------------- templates/es/home.template | 139 ++++++++++++++++++++++--------------------- templates/fr/home.template | 141 +++++++++++++++++++++++--------------------- templates/pl/home.template | 143 ++++++++++++++++++++++++--------------------- templates/pt/home.template | 143 ++++++++++++++++++++++++--------------------- templates/tr/home.template | 139 ++++++++++++++++++++++--------------------- templates/uk/home.template | 139 ++++++++++++++++++++++--------------------- 7 files changed, 507 insertions(+), 476 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=28c604f2c37c96589e…

1 0

Jeremy Newman : use icons from bootstrap for prev/next links
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: cfee2e26691dff8516dfd6d6a15eb8277b4ac4c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=cfee2e26691dff8516dfd6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:54:14 2016 -0600 use icons from bootstrap for prev/next links --- include/plugins/news.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index a42c9fc..e78b0eb 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -7,7 +7,7 @@ */ // language override -if ($_GET['lang'] and in_array($_GET['lang'], $config->languages)) +if (!empty($_GET['lang']) and in_array($_GET['lang'], $config->languages)) $html->lang = $_GET['lang']; // display news based on page params @@ -40,7 +40,7 @@ switch (true) $html->page_title .= " - {$html->meta_og['title']}"; // if link defined, use it in title - if ($vars['link']) + if (!empty($vars['link'])) { $vars['link'] = str_replace("{\$root}", $html->_web_root, $vars['link']); $vars['title'] = '<a href="'.$vars['link'].'">'.$vars['title'].'</a>'; @@ -133,7 +133,7 @@ switch (true) // where are we in news list $x = 0; - if (is_numeric(PAGE_PARAMS)) + if (defined('PAGE_PARAMS') and is_numeric(PAGE_PARAMS)) $x = PAGE_PARAMS; // get list of news items @@ -160,7 +160,7 @@ switch (true) $vars = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); // if link defined, use it in title - if ($vars['link']) + if (!empty($vars['link'])) { $vars['link'] = str_replace("{\$root}", $html->_web_root, $vars['link']); $vars['title'] = '<a href="'.$vars['link'].'">'.$vars['title'].'</a>'; @@ -190,19 +190,19 @@ switch (true) $next_link = ""; // add back to first page link when not first page if ($x != 0) - $prev_link .= $html->ahref("[First Page]", $_SERVER['PHP_SELF'], 'class="menuItem"')." "; + $prev_link .= $html->ahref('<span class="glyphicon glyphicon-fast-backward"></span>', $_SERVER['PHP_SELF'], 'class="menuItem"')." "; // display prev link if ($x > 0) - $prev_link .= $html->ahref("<< Previous Page","{$_SERVER['PHP_SELF']}".($x - $amax), 'class="menuItem"'); + $prev_link .= $html->ahref('<span class="glyphicon glyphicon-chevron-left"></span>', $_SERVER['PHP_SELF'].($x - $amax), 'class="menuItem"'); // display next link if (($x + $amax) < $total) { - $next_link .= $html->ahref("Next Page >>","{$_SERVER['PHP_SELF']}".($x + $amax) , 'class="menuItem"'); + $next_link .= $html->ahref('<span class="glyphicon glyphicon-chevron-right"></span>', $_SERVER['PHP_SELF'].($x + $amax) , 'class="menuItem"'); // add jump to last page link - $next_link .= " ".$html->ahref("[Last Page]","{$_SERVER['PHP_SELF']}".($pages * $amax) , 'class="menuItem"'); + $next_link .= " ".$html->ahref('<span class="glyphicon glyphicon-fast-forward"></span>', $_SERVER['PHP_SELF'].($pages * $amax) , 'class="menuItem"'); } // add prev/next links - echo $html->p($html->div($prev_link.'   '.$next_link, 'align="center"')); + echo $html->p($html->div($prev_link.'   '.$next_link, 'class="center"')); } // end default }

1 0

Jeremy Newman : move translatable strings from global theme into global trans table
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 415095689f4eee6f309705960b5819e30fb6ffe0 URL: http://source.winehq.org/git/website.git/?a=commit;h=415095689f4eee6f309705… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:33:32 2016 -0600 move translatable strings from global theme into global trans table --- include/incl.php | 3 +++ site.php | 3 +-- templates/en/global/layout/content.template | 14 +++++++------- templates/en/global/xml/trans/global.xml | 15 +++++++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/include/incl.php b/include/incl.php index 302d9c1..4a52861 100644 --- a/include/incl.php +++ b/include/incl.php @@ -114,4 +114,7 @@ else unset($lang); } +// load global translation table +$html->load_trans("global"); + ?> diff --git a/site.php b/site.php index 77b2a56..29c5159 100644 --- a/site.php +++ b/site.php @@ -132,13 +132,12 @@ if (defined("PAGE") and PAGE == "home") } // online mode switch -if ($config->offline) +if (!empty($config->offline)) { /* OFFLINE */ $html->_error_mode = 1; - $PAGE_template = "content_nonav"; $PAGE_body = $html->template("local", 'global/website_offline'); } else diff --git a/templates/en/global/layout/content.template b/templates/en/global/layout/content.template index 05677a2..82d4942 100644 --- a/templates/en/global/layout/content.template +++ b/templates/en/global/layout/content.template @@ -38,11 +38,11 @@ <div id="whq-tabs"> <div class="whq-tabs-menu">☰</div> <ul> - <li class="s"><a href="{$base_url}">WineHQ</a></li> - <li><a href="http://wiki.winehq.org/">Wiki</a></li> - <li><a href="//appdb.winehq.org/">AppDB</a></li> - <li><a href="//bugs.winehq.org/">Bugzilla</a></li> - <li><a href="//forums.winehq.org/">Forums</a></li> + <li class="s"><a href="{$base_url}">{trans($tab_winehq)}</a></li> + <li><a href="http://wiki.winehq.org/">{trans($tab_wiki)}</a></li> + <li><a href="//appdb.winehq.org/">{trans($tab_appdb)}</a></li> + <li><a href="//bugs.winehq.org/">{trans($tab_bugs)}</a></li> + <li><a href="//forums.winehq.org/">{trans($tab_forums)}</a></li> </ul> </div> <div class="clear"></div> @@ -70,9 +70,9 @@ <span class="glyphicon glyphicon-globe large"></span> {$langCur} (<a href="{$root}/lang">{$langChange}</a>) </div> <div class="col-xs-6 text-right"> - Hosted By + {trans($hosted_by)} <a href="https://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" - title="CodeWeavers - Run Windows applications and games on Mac and Linux"></a> + title="{trans($hosted_by_alt)}"></a> </div> </div> </div> diff --git a/templates/en/global/xml/trans/global.xml b/templates/en/global/xml/trans/global.xml new file mode 100644 index 0000000..42c0496 --- /dev/null +++ b/templates/en/global/xml/trans/global.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" ?> +<trans lang="en" table="global"> + +  + <str name="tab_winehq">WineHQ</str> + <str name="tab_wiki">Wiki</str> + <str name="tab_appdb">AppDB</str> + <str name="tab_bugs">Bugzilla</str> + <str name="tab_forums">Forums</str> + +  + <str name="hosted_by">Hosted By</str> + <str name="hosted_by_alt">CodeWeavers - Run Windows applications and games on Mac and Linux</str> + +</trans>

1 0

Jeremy Newman : Rename site index to site.php
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: fc754d85752ceb6509021147ba1997914be821fc URL: http://source.winehq.org/git/website.git/?a=commit;h=fc754d85752ceb65090211… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 5 14:21:11 2016 -0600 Rename site index to site.php This will make things easier on Non-Apache based Web Servers Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 6 +++--- site => site.php | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 4d04076..775e8ad 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -2,7 +2,7 @@ allow from all # Set Our Default Directory Index -DirectoryIndex site index.html index.shtml index.cgi index.php +DirectoryIndex site.php index.html index.shtml index.cgi index.php # Website Offline #RewriteEngine on @@ -21,7 +21,7 @@ php_value arg_separator.output ";" php_value arg_separator.input ";&" # force the php to accept PATH_INFO -<Files ~ (site)$> +<Files ~ (site.php)$> AcceptPathInfo On ForceType application/x-httpd-php </Files> @@ -105,5 +105,5 @@ RedirectPermanent /diff https://source.winehq.org/search RewriteEngine on Rewritebase / RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule ^(.+) site/$1 [L] +RewriteRule ^(.+) site.php/$1 [L] diff --git a/site b/site.php similarity index 100% rename from site rename to site.php

1 0

Alexandre Julliard : server: Add a helper function to skip the object attributes structure.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: c4843d4a45c5af5e536fdf51c4456f935c16c075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4843d4a45c5af5e536fdf51c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 15:00:21 2016 +0900 server: Add a helper function to skip the object attributes structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 3 +-- server/request.c | 9 +++++++++ server/request.h | 1 + server/symlink.c | 5 ++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server/file.c b/server/file.c index 9fd3a9e..39f6ff0 100644 --- a/server/file.c +++ b/server/file.c @@ -711,8 +711,7 @@ DECL_HANDLER(create_file) if (!root_fd) return; } - name = (const char *)get_req_data() + sizeof(*objattr) + objattr->sd_len; - name_len = get_req_data_size() - sizeof(*objattr) - objattr->sd_len; + name = get_req_data_after_objattr( objattr, &name_len ); reply->handle = 0; if ((file = create_file( root_fd, name, name_len, req->access, req->sharing, diff --git a/server/request.c b/server/request.c index 2debf6d..942bc42 100644 --- a/server/request.c +++ b/server/request.c @@ -198,6 +198,15 @@ const struct object_attributes *get_req_object_attributes( const struct security return attr; } +/* return a pointer to the request data following an object attributes structure */ +const void *get_req_data_after_objattr( const struct object_attributes *attr, data_size_t *len ) +{ + const void *ptr = (const WCHAR *)((const struct object_attributes *)get_req_data() + 1) + + attr->sd_len / sizeof(WCHAR) + attr->name_len / sizeof(WCHAR); + *len = get_req_data_size() - ((const char *)ptr - (const char *)get_req_data()); + return ptr; +} + /* write the remaining part of the reply */ void write_reply( struct thread *thread ) { diff --git a/server/request.h b/server/request.h index 2c99c79..caaa30e 100644 --- a/server/request.h +++ b/server/request.h @@ -48,6 +48,7 @@ extern const char *get_config_dir(void); extern void *set_reply_data_size( data_size_t size ); extern const struct object_attributes *get_req_object_attributes( const struct security_descriptor **sd, struct unicode_str *name ); +extern const void *get_req_data_after_objattr( const struct object_attributes *attr, data_size_t *len ); extern int receive_fd( struct process *process ); extern int send_client_fd( struct process *process, int fd, obj_handle_t handle ); extern void read_request( struct thread *thread ); diff --git a/server/symlink.c b/server/symlink.c index 28d51ab..abc34f2 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -174,9 +174,8 @@ DECL_HANDLER(create_symlink) if (!objattr) return; - target.str = (const WCHAR *)get_req_data() + sizeof(*objattr) / sizeof(WCHAR) + - objattr->sd_len / sizeof(WCHAR) + name.len / sizeof(WCHAR); - target.len = get_req_data_size() - ((const char *)target.str - (const char *)get_req_data()); + target.str = get_req_data_after_objattr( objattr, &target.len ); + target.len = (target.len / sizeof(WCHAR)) * sizeof(WCHAR); if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return;

1 0

Stefan Leichter : kernel32/tests: Add tests for GetSystemPreferredUILanguages.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: cfaca5ea5c4edaaf537459120a06bafa1b37bc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfaca5ea5c4edaaf537459120… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Sun Jan 17 10:00:55 2016 +0100 kernel32/tests: Add tests for GetSystemPreferredUILanguages. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 201 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7b0212e..b760e9a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -97,6 +97,7 @@ static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); +static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static void InitFunctionPointers(void) { @@ -125,6 +126,7 @@ static void InitFunctionPointers(void) X(GetGeoInfoA); X(GetGeoInfoW); X(EnumSystemGeoID); + X(GetSystemPreferredUILanguages); #undef X } @@ -4559,6 +4561,204 @@ static void test_invariant(void) } } +static void test_GetSystemPreferredUILanguages(void) +{ + BOOL ret; + ULONG count, size, size_id, size_name, size_buffer; + WCHAR *buffer; + + + if (!pGetSystemPreferredUILanguages) + { + win_skip("GetSystemPreferredUILanguages is not available.\n"); + return; + } + + /* (in)valid first parameter */ + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(0, &count, NULL, &size); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_FULL_LANGUAGE, &count, NULL, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_FULL_LANGUAGE, &count, NULL, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_LANGUAGE_NAME, &count, NULL, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + + /* second parameter + * ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, NULL, NULL, &size); + * -> unhandled exception c0000005 + */ + + /* invalid third parameter */ + count = 0xdeadbeef; + size = 1; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* fourth parameter + * ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, NULL); + * -> unhandled exception c0000005 + */ + + count = 0xdeadbeef; + size_id = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); + + count = 0xdeadbeef; + size_name = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size_name % 6 == 1, "Expected size (%d) %% 6 == 1\n", size_name); + + size_buffer = max(size_id, size_name); + if(!size_buffer) + { + skip("No vaild buffer size\n"); + return; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, size_buffer * sizeof(WCHAR)); + if (!buffer) + { + skip("Failed to allocate memory with size %d\n", size_buffer * sizeof(WCHAR)); + return; + } + + count = 0xdeadbeef; + size = size_buffer; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(0, &count, buffer, &size); + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + if (ret && size % 6 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = size_buffer; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); + if (ret && size % 5 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = size_buffer; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, buffer, &size); + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + if (ret && size % 5 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + if (ret && size % 6 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = 1; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = size_id -1; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = size_id -2; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(0, &count, buffer, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +} + START_TEST(locale) { InitFunctionPointers(); @@ -4600,6 +4800,7 @@ START_TEST(locale) test_GetGeoInfo(); test_EnumSystemGeoID(); test_invariant(); + test_GetSystemPreferredUILanguages(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Aric Stewart : usp10: Rewrite ScriptXtoCP.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: c160ad9e89fd9488e1d81c668780a5e5488af599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c160ad9e89fd9488e1d81c668… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 18 07:50:44 2016 -0600 usp10: Rewrite ScriptXtoCP. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 107 +++++++++++++++- dlls/usp10/usp10.c | 311 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 318 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c160ad9e89fd9488e1d81…

1 0