wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Jeremy Newman : use icons from bootstrap for prev/next links
by Jeremy Newman 19 Jan '16

19 Jan '16

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('', $_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('', $_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('', $_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('', $_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 : remove template, merge into plugin
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 120f2717b5973a7affe892cb985c89be4ae630fc URL: http://source.winehq.org/git/website.git/?a=commit;h=120f2717b5973a7affe892… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:52:39 2016 -0600 remove template, merge into plugin --- include/plugins/language.php | 9 +++------ templates/en/global/lang_row.template | 3 --- templates/tr/global/lang_row.template | 3 --- templates/uk/global/lang_row.template | 3 --- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/plugins/language.php b/include/plugins/language.php index dc8da6f..8ea917e 100644 --- a/include/plugins/language.php +++ b/include/plugins/language.php @@ -12,12 +12,9 @@ switch ($_PLUGIN['cmd']) case "list": foreach ($config->languages as $lang) { - $row = array( - 'lang' => $lang, - 'langFull' => $data->languages[$lang]['name'], - 'langHelp' => $data->languages[$lang]['change'] - ); - echo $html->template('local', 'global/lang_row', $row, 1); + echo "<li style=\"background-image: url('{$html->base_url()}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;\">\n". + " <a href=\"{$html->base_url()}/lang/{$lang}\">{$whq_data->languages[$lang]['name']}</a> · {$whq_data->languages[$lang]['change']}\n". + "</li>\n"; } break; diff --git a/templates/en/global/lang_row.template b/templates/en/global/lang_row.template deleted file mode 100644 index cb6c776..0000000 --- a/templates/en/global/lang_row.template +++ /dev/null @@ -1,3 +0,0 @@ - <li style="background-image: url('{$root}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/{$lang}">{$langFull}</a> · {$langHelp} - </li> diff --git a/templates/tr/global/lang_row.template b/templates/tr/global/lang_row.template deleted file mode 100644 index cb6c776..0000000 --- a/templates/tr/global/lang_row.template +++ /dev/null @@ -1,3 +0,0 @@ - <li style="background-image: url('{$root}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/{$lang}">{$langFull}</a> · {$langHelp} - </li> diff --git a/templates/uk/global/lang_row.template b/templates/uk/global/lang_row.template deleted file mode 100644 index cb6c776..0000000 --- a/templates/uk/global/lang_row.template +++ /dev/null @@ -1,3 +0,0 @@ - <li style="background-image: url('{$root}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/{$lang}">{$langFull}</a> · {$langHelp} - </li>

1 0

Jeremy Newman : added new crossover logo for download page
by Jeremy Newman 19 Jan '16

19 Jan '16

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 : new WineHQ website theme and layout
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 084c119b5d0d4e5f6ad8ec68f3d1e3e226b77e75 URL: http://source.winehq.org/git/website.git/?a=commit;h=084c119b5d0d4e5f6ad8ec… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:42:31 2016 -0600 new WineHQ website theme and layout * updates to base engine * new mobile friendly base theme * cleanup --- css/styles.css | 622 +++++++++++ include/html.php | 1075 +++++++++++++------- include/incl.php | 90 +- include/utils.php | 145 ++- include/winehq.conf.sample | 41 +- jquery.js => js/jquery.js | 0 jquery.pngfix.js => js/jquery.pngfix.js | 0 swfobject.js => js/swfobject.js | 0 js/utils.js | 74 ++ site.php | 251 ++++- styles.css | 327 ------ templates/en/global/layout/content.template | 85 ++ .../winehq => layout}/content_print.template | 0 templates/en/global/layout/debug_log.template | 4 + templates/en/global/themes/winehq/content.template | 71 -- .../en/global/themes/winehq/content_nobox.template | 73 -- utils.js | 21 - 17 files changed, 1935 insertions(+), 944 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=084c119b5d0d4e5f6a…

1 0

Jeremy Newman : removing he translation, needs a rewrite for new design
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 9039c563baf97a8a5d20ec3f53aac89640702140 URL: http://source.winehq.org/git/website.git/?a=commit;h=9039c563baf97a8a5d20ec… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:41:59 2016 -0600 removing he translation, needs a rewrite for new design --- images/bg_rtl.jpg | Bin 62471 -> 0 bytes styles-rtl.css | 107 ---- templates/he/about.template | 23 - templates/he/announce.template | 7 - templates/he/devel.template | 154 ------ templates/he/documentation.template | 78 --- templates/he/download.template | 153 ------ templates/he/forums.template | 119 ----- templates/he/global/404.template | 18 - templates/he/global/themes/winehq/content.template | 72 --- .../he/global/themes/winehq/content_nobox.template | 74 --- templates/he/help.template | 102 ---- templates/he/home.template | 91 ---- templates/he/interview.template | 8 - templates/he/irc.template | 19 - templates/he/lang.template | 13 - templates/he/license.template | 584 --------------------- templates/he/news.template | 16 - templates/he/news_row.template | 5 - templates/he/resources.template | 130 ----- templates/he/search.template | 19 - templates/he/status.template | 132 ----- templates/he/wwn.template | 9 - templates/he/wwn_content.template | 23 - templates/he/wwn_interview.template | 13 - 25 files changed, 1969 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=9039c563baf97a8a5d…

1 0

Jeremy Newman : renamed and moved stop pages to the global config
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 8ada05f658c093633df4e3c460499b838dfa3b95 URL: http://source.winehq.org/git/website.git/?a=commit;h=8ada05f658c093633df4e3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 12 16:12:45 2016 -0600 renamed and moved stop pages to the global config --- include/{data.php => whq_data.php} | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/include/data.php b/include/whq_data.php similarity index 84% rename from include/data.php rename to include/whq_data.php index b549ed2..b580b81 100644 --- a/include/data.php +++ b/include/whq_data.php @@ -4,32 +4,16 @@ WineHQ misc data class by Jeremy Newman <jnewman(a)codeweavers.com> -*/ +*/ -/* - * data class - misc global hard data - */ - -class data +class whq_data { // defines - public $stop_page; public $languages; // constuctor public function __construct () { - // plugin stop pages - // add the template path here to make anything after the path in the URL - // be stored in the static PAGE_PARAMS - $this->stop_page = array( - 'announce', - 'interview', - 'lang', - 'news', - 'wwn' - ); - // available languages $this->languages = array( 'en' => array(

1 0

Jeremy Newman : Rename site index to site.php
by Jeremy Newman 19 Jan '16

19 Jan '16

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

Akihiro Sagawa : comctl32/tests: Fix a typo.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: d1841f496b423afa0e29cd7da87cfd297e5e8054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1841f496b423afa0e29cd7da… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jan 19 23:45:05 2016 +0900 comctl32/tests: Fix a typo. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index acfcd20..2afa44d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -198,7 +198,7 @@ static const struct message forward_erasebkgnd_parent_seq[] = { { 0 } }; -static const struct message ownderdata_select_focus_parent_seq[] = { +static const struct message ownerdata_select_focus_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, { WM_NOTIFY, sent|id|optional, 0, 0, LVN_GETDISPINFOA }, /* version 4.7x */ @@ -3146,7 +3146,7 @@ static void test_ownerdata(void) res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); expect(TRUE, res); - ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_focus_parent_seq, "ownerdata select notification", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -3157,7 +3157,7 @@ static void test_ownerdata(void) res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); expect(TRUE, res); - ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_focus_parent_seq, "ownerdata focus notification", TRUE); /* select all, check notifications */

1 0

Piotr Caban : msvcrt: Add _crt_debugger_hook implementation.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: ecfc10bbfb2124e01ea99ac6ccb979071913f716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfc10bbfb2124e01ea99ac6c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 19 13:53:19 2016 +0100 msvcrt: Add _crt_debugger_hook implementation. Based on a patch by Andrey Zhezherun. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 3 ++- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 3 ++- dlls/msvcrt/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 6afa042..65a73ad 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -30,7 +30,7 @@ @ cdecl _controlfp_s(ptr long long) ucrtbase._controlfp_s @ stub _crt_at_quick_exit @ cdecl _crt_atexit(ptr) ucrtbase._crt_atexit -@ stub _crt_debugger_hook +@ cdecl _crt_debugger_hook(long) ucrtbase._crt_debugger_hook @ cdecl _endthread() ucrtbase._endthread @ cdecl _endthreadex(long) ucrtbase._endthreadex @ cdecl _errno() ucrtbase._errno diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d8627d2..39742aa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -745,7 +745,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub _crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index bf82d30..dd23c75 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1093,8 +1093,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 69cb2c1..461b529 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1084,8 +1084,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1e4554f..425c839 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1038,8 +1038,8 @@ @ cdecl _copysignf(float float) msvcr120._copysignf @ cdecl _creat(str long) msvcr120._creat @ cdecl _create_locale(long str) msvcr120._create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) msvcr120._crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) msvcr120.__crt_debugger_hook @ cdecl _ctime32(ptr) msvcr120._ctime32 @ cdecl _ctime32_s(str long ptr) msvcr120._ctime32_s @ cdecl _ctime64(ptr) msvcr120._ctime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5107038..17af90b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -409,8 +409,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub -arch=i386 _crt_debugger_hook -@ stub -arch=arm,win64 __crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 30bfbcd..fd08455 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -392,7 +392,8 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub _crt_debugger_hook +@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook +@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) @ varargs _cscanf_s(str) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 4e9f288..c1510ef 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -498,3 +498,11 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src) { __ms_va_copy(*dest, src); } + +/********************************************************************* + * _crt_debugger_hook (MSVCR80.@) + */ +void CDECL MSVCRT__crt_debugger_hook(int reserved) +{ + WARN("(%x)\n", reserved); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e65a1c0..e59e26f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -242,7 +242,7 @@ @ cdecl _create_locale(long str) MSVCRT__create_locale @ stub _crt_at_quick_exit @ cdecl _crt_atexit(ptr) MSVCRT__crt_atexit -@ stub _crt_debugger_hook +@ cdecl _crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ cdecl _ctime32(ptr) MSVCRT__ctime32 @ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s @ cdecl _ctime64(ptr) MSVCRT__ctime64

1 0

Pierre Schweitzer : mpr: Implement WNetAddConnectionA(), WNetAddConnection2A(), WNetAddConnection3A().
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 39ec97ea9dcba270bbea31a7eaa7b842bf1beb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ec97ea9dcba270bbea31a7e… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Jan 16 09:51:14 2016 +0100 mpr: Implement WNetAddConnectionA(), WNetAddConnection2A(), WNetAddConnection3A(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 941cada..2b53f2a 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1487,11 +1487,12 @@ DWORD WINAPI WNetGetResourceParentW( LPNETRESOURCEW lpNetResource, DWORD WINAPI WNetAddConnectionA( LPCSTR lpRemoteName, LPCSTR lpPassword, LPCSTR lpLocalName ) { - FIXME( "(%s, %p, %s): stub\n", - debugstr_a(lpRemoteName), lpPassword, debugstr_a(lpLocalName) ); + NETRESOURCEA resourcesA; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + memset(&resourcesA, 0, sizeof(resourcesA)); + resourcesA.lpRemoteName = (LPSTR)lpRemoteName; + resourcesA.lpLocalName = (LPSTR)lpLocalName; + return WNetUseConnectionA(NULL, &resourcesA, lpPassword, NULL, 0, NULL, 0, NULL); } /********************************************************************* @@ -1515,11 +1516,8 @@ DWORD WINAPI WNetAddConnection2A( LPNETRESOURCEA lpNetResource, LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %s, 0x%08X): stub\n", - lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionA(NULL, lpNetResource, lpPassword, lpUserID, dwFlags, + NULL, 0, NULL); } /********************************************************************* @@ -1540,11 +1538,8 @@ DWORD WINAPI WNetAddConnection3A( HWND hwndOwner, LPNETRESOURCEA lpNetResource, LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %p, %s, 0x%08X), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionA(hwndOwner, lpNetResource, lpPassword, lpUserID, + dwFlags, NULL, 0, NULL); } /*********************************************************************

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016