wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Octavian Voicu : Fix player in WineConf Media page.
by Jeremy Newman 07 Sep '10

07 Sep '10

Module: website Branch: master Commit: 45b9b088b5b170c9865ee944f12c7a961c84b569 URL: http://source.winehq.org/git/website.git/?a=commit;h=45b9b088b5b170c9865ee9… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Sun Sep 5 00:50:18 2010 +0300 Fix player in WineConf Media page. New player is JW Player, free for non-commerical use: http://www.longtailvideo.com/players/jw-flv-player/ The currently referenced files (mediaplayer.swf and swfobject.js) are no longer hosted on CodeWeavers server. I sent swfobject.js as binary diff because of the very long lines. --- player.swf | Bin 0 -> 91377 bytes swfobject.js | 4 ++++ templates/en/wineconf/media.template | 8 +++----- 3 files changed, 7 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=45b9b088b5b170c986…

1 0

Jeremy Newman : move the base themes into the templates dir so they can be translated as well , also allow langCode to be used on the theme pages, other misc cleanups in the html class
by Jeremy Newman 07 Sep '10

07 Sep '10

Module: website Branch: master Commit: 873a7c2b7157577686576fa56de4b9979c06c36b URL: http://source.winehq.org/git/website.git/?a=commit;h=873a7c2b7157577686576f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 7 09:39:00 2010 -0500 move the base themes into the templates dir so they can be translated as well, also allow langCode to be used on the theme pages, other misc cleanups in the html class --- include/html.php | 37 +++++++++++-------- .../en/global}/themes/winehq/content.template | 3 +- .../global}/themes/winehq/content_nobox.template | 5 +-- .../global}/themes/winehq/content_print.template | 0 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/include/html.php b/include/html.php index 1b1b3d4..5d4ef31 100644 --- a/include/html.php +++ b/include/html.php @@ -1135,7 +1135,7 @@ class html $theme = $config->theme; // debug - debug("template", "loading template: theme:[".$theme."] lang: [".$this->lang."] template:[".$template."]"); + debug("template", "loading template: theme:[{$theme}] lang: [{$this->lang}] template:[{$template}]"); // load from cache if we have already loaded before if (isset($this->template_cache[$template])) @@ -1150,22 +1150,24 @@ class html // load from local template repository case "base": case "local": - if (file_exists($this->_file_root."/templates/".$this->lang."/".$template.".template")) - $in = join("",file($this->_file_root."/templates/".$this->lang."/".$template.".template")); - else if (($config->lang != $this->lang) and file_exists($this->_file_root."/templates/".$config->lang."/".$template.".template")) - $in = join("",file($this->_file_root."/templates/".$config->lang."/".$template.".template")); + if (file_exists("{$this->_file_root}/templates/{$this->lang}/{$template}.template")) + $in = join("",file("{$this->_file_root}/templates/{$this->lang}/{$template}.template")); + else if (($config->lang != $this->lang) and file_exists("{$this->_file_root}/templates/{$config->lang}/{$template}.template")) + $in = join("",file("{$this->_file_root}/templates/{$config->lang}/{$template}.template")); break; // load from global case "global": - if (file_exists($this->_file_root."/templates/global/".$template.".template")) - $in = join("",file($this->_file_root."/templates/global/".$template.".template")); + if (file_exists("{$this->_file_root}/templates/global/{$template}.template")) + $in = join("",file("{$this->_file_root}/templates/global/{$template}.template")); break; // load template from theme default: - if (file_exists($this->_file_root."/include/themes/".$theme."/".$template.".template")) - $in = join("",file($this->_file_root."/include/themes/".$theme."/".$template.".template")); + if (file_exists("{$this->_file_root}/templates/{$this->lang}/global/themes/{$theme}/{$template}.template")) + $in = join("",file("{$this->_file_root}/templates/{$this->lang}/global/themes/{$theme}/{$template}.template")); + else if (($config->lang != $this->lang) and file_exists("{$this->_file_root}/templates/{$config->lang}/global/themes/{$theme}/{$template}.template")) + $in = join("",file("{$this->_file_root}/templates/{$config->lang}/global/themes/{$theme}/{$template}.template")); } } @@ -1174,10 +1176,10 @@ class html { $in = ''; $this->in404 = 1; - if (file_exists($this->_file_root."/templates/".$this->lang."/global/404.template")) - $in .= join("",file($this->_file_root."/templates/".$this->lang."/global/404.template")); - else if (file_exists($this->_file_root."/templates/".$config->lang."/global/404.template")) - $in .= join("",file($this->_file_root."/templates/".$config->lang."/global/404.template")); + if (file_exists("{$this->_file_root}/templates/{$this->lang}/global/404.template")) + $in .= join("",file("{$this->_file_root}/templates/{$this->lang}/global/404.template")); + else if (file_exists("{$this->_file_root}/templates/{$config->lang}/global/404.template")) + $in .= join("",file("{$this->_file_root}/templates/{$config->lang}/global/404.template")); else $in .= $this->h1("404 Not Found!"); } @@ -1206,11 +1208,14 @@ class html $vars['curtime_year'] = date('Y', time()); // language vars - if (defined("PAGE") and (PAGE == "home" or PAGE == "lang")) + if (defined("PAGE")) { $vars['langCode'] =& $this->lang; - $vars['langCur'] =& $GLOBALS['data']->languages[$this->lang]['name']; - $vars['langChange'] =& $GLOBALS['data']->languages[$this->lang]['change']; + if (PAGE == "home" or PAGE == "lang") + { + $vars['langCur'] =& $GLOBALS['data']->languages[$this->lang]['name']; + $vars['langChange'] =& $GLOBALS['data']->languages[$this->lang]['change']; + } } // add config vars diff --git a/include/themes/winehq/content.template b/templates/en/global/themes/winehq/content.template similarity index 96% rename from include/themes/winehq/content.template rename to templates/en/global/themes/winehq/content.template index 272ae0a..cd405ff 100644 --- a/include/themes/winehq/content.template +++ b/templates/en/global/themes/winehq/content.template @@ -9,7 +9,6 @@ <meta name="keywords" content="windows, linux, macintosh, solaris, freebsd"> <meta name="robots" content="index, follow"> <meta name="copyright" content="Copyright {$curtime_year}. WineHQ.org All Rights Reserved."> - <meta name="author" content="Jeremy Newman"> <meta name="language" content="English"> <meta name="revisit-after" content="1"> <link rel="stylesheet" href="{$root}/styles.css" type="text/css" media="screen"> @@ -39,7 +38,7 @@ <input type="hidden" name="ie" value="UTF-8"> <span style="color: #ffffff;">Search:</span> <input type="text" name="q" size="20"> </form> - <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script> + <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang={$langCod…"></script> </div> diff --git a/include/themes/winehq/content_nobox.template b/templates/en/global/themes/winehq/content_nobox.template similarity index 93% rename from include/themes/winehq/content_nobox.template rename to templates/en/global/themes/winehq/content_nobox.template index 71a083a..8eaa440 100644 --- a/include/themes/winehq/content_nobox.template +++ b/templates/en/global/themes/winehq/content_nobox.template @@ -9,7 +9,6 @@ <meta name="keywords" content="windows, linux, macintosh, solaris, freebsd"> <meta name="robots" content="index, follow"> <meta name="copyright" content="Copyright {$curtime_year}. WineHQ.org All Rights Reserved."> - <meta name="author" content="Jeremy Newman"> <meta name="language" content="English"> <meta name="revisit-after" content="1"> <link rel="stylesheet" href="{$root}/styles.css" type="text/css" media="screen"> @@ -33,13 +32,13 @@ <div id="search_box"> - <form action="{$root}/search" id="cse-search-box" style="margin: 0; padding: 0;"> + <form action="{$root}/search/" id="cse-search-box" style="margin: 0; padding: 0;"> <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf"> <input type="hidden" name="cof" value="FORID:10"> <input type="hidden" name="ie" value="UTF-8"> <span style="color: #ffffff;">Search:</span> <input type="text" name="q" size="20"> </form> - <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script> + <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang={$langCod…"></script> </div> diff --git a/include/themes/winehq/content_print.template b/templates/en/global/themes/winehq/content_print.template similarity index 100% rename from include/themes/winehq/content_print.template rename to templates/en/global/themes/winehq/content_print.template

1 0

Frédéric Delanoy : Add French translation of search results page
by Jeremy Newman 07 Sep '10

07 Sep '10

Module: website Branch: master Commit: b92ded986d01cca0a9dd88adc0ec334e756a8273 URL: http://source.winehq.org/git/website.git/?a=commit;h=b92ded986d01cca0a9dd88… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 4 00:16:56 2010 +0200 Add French translation of search results page --- templates/fr/search.template | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/templates/fr/search.template b/templates/fr/search.template new file mode 100644 index 0000000..a144a70 --- /dev/null +++ b/templates/fr/search.template @@ -0,0 +1,26 @@ + + + +<h1 class="title" style="margin-bottom: 10px;">Résultats de la recherche</h1> + +<div id="cse-search-results"></div> +<script type="text/javascript"> + $.gglclientCoords = function() { + var dimensions = {width: 0, height: 0}; + if (document.documentElement) { + dimensions.width = document.documentElement.offsetWidth; + dimensions.height = document.documentElement.offsetHeight; + } else if (window.innerWidth && window.innerHeight) { + dimensions.width = window.innerWidth; + dimensions.height = window.innerHeight; + } + return dimensions; + } + var googleSearchIframeName = "cse-search-results"; + var googleSearchFormName = "cse-search-box"; + var googleSearchFrameWidth = ($.gglclientCoords().width - 250); + var googleSearchDomain = "www.google.fr"; + var googleSearchPath = "/cse"; +</script> +<script type="text/javascript" src="http://www.google.fr/afsonline/show_afs_search.js"></script> +

1 0

Frédéric Delanoy : French translation for release 1.3.2
by Jeremy Newman 07 Sep '10

07 Sep '10

Module: website Branch: master Commit: 78e0a37d145ed9018d86d03d91ccf893dadd9e9a URL: http://source.winehq.org/git/website.git/?a=commit;h=78e0a37d145ed9018d86d0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 3 23:09:21 2010 +0200 French translation for release 1.3.2 --- news/fr/2010090301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/fr/2010090301.xml b/news/fr/2010090301.xml new file mode 100644 index 0000000..2ec78f3 --- /dev/null +++ b/news/fr/2010090301.xml @@ -0,0 +1,18 @@ +<news> +<date>3 septembre 2010</date> +<title>Sortie de Wine 1.3.2</title> +<body> +<p> La version de développement 1.3.2 de Wine est à présent disponible.</p> +<p> <a href="{$root}/announce/1.3.2">Nouveautés</a> de cette version : +<ul> + <li>Mise à jour du moteur Gecko, qui inclut dorénavant une version 64 bits.</li> + <li>Nouvelle implémentation du support de la console sur les terminaux Unix.</li> + <li>Un tas de nouvelles fonctions dans les DLL du runtime C.</li> + <li>Diverses corrections de bogues.</li> +</ul></p> +<p><p>Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.2.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Austin English : kernel32/tests: Be sure to terminate array.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 7f30ae6349e01095823e6f84714cc209a20cafae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f30ae6349e01095823e6f847… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 6 12:58:35 2010 -0500 kernel32/tests: Be sure to terminate array. --- dlls/kernel32/tests/time.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 0b3959a..5dd0d41 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -582,6 +582,7 @@ static void test_TzSpecificLocalTimeToSystemTime(void) , {25,28,2,22,2,22} /* 2017 */ , {24,27,1,28,1,28} /* 2018 */ , {30,26,7,27,7,27} /* 2019 */ + , {0} }; for( j=0 , year = 1999; yeardays[j][0] ; j++, year++) { for (i=0; cases[i].nr; i++) {

1 0

Roderick Colenbrander : wined3d: Separate driver info from GPU info.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 878dcc6d93d8b1981508d0ef4a41d453598e3aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=878dcc6d93d8b1981508d0ef4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Jul 31 03:02:01 2010 +0200 wined3d: Separate driver info from GPU info. --- dlls/wined3d/directx.c | 263 ++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 21 +++ 2 files changed, 193 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=878dcc6d93d8b1981508d…

1 0

Michael Mc Donnell : shell32/tests: Test that basic renaming is supported.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 605611f8db262105b3fcc1f2c4cd37f75d53b977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605611f8db262105b3fcc1f2c… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Thu Sep 2 19:21:47 2010 +0200 shell32/tests: Test that basic renaming is supported. --- dlls/shell32/tests/brsfolder.c | 79 ++++++++++++++++++++++++++++++---------- 1 files changed, 60 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index af2bc73..0aebb74 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -1,7 +1,7 @@ /* * Unit test of the SHBrowseForFolder function. * - * Copyright 2009 Michael Mc Donnell + * Copyright 2009-2010 Michael Mc Donnell * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +24,9 @@ #include "wine/test.h" #define IDD_MAKENEWFOLDER 0x3746 /* From "../shresdef.h" */ +#define TIMER_WAIT_MS 50 /* Should be long enough for slow systems */ + +static const char new_folder_name[] = "foo"; /* * Returns the number of folders in a folder. @@ -63,9 +66,38 @@ static BOOL does_folder_or_file_exist(LPCSTR folder_path) } /* - * Callback used by test_click_make_new_folder_button for SHBrowseForFolder - * dialog box. It clicks the "Make New Folder" button and then closes the dialog - * box. + * Timer callback used by test_click_make_new_folder_button. It simulates a user + * making a new folder and calling it "foo". + */ +static void CALLBACK make_new_folder_timer_callback(HWND hwnd, UINT uMsg, + UINT_PTR idEvent, DWORD dwTime) +{ + static int step = 0; + + switch (step++) + { + case 0: + /* Click "Make New Folder" button */ + PostMessage(hwnd, WM_COMMAND, IDD_MAKENEWFOLDER, 0); + break; + case 1: + /* Set the new folder name to foo by replacing text in edit control */ + SendMessage(GetFocus(), EM_REPLACESEL, 0, (LPARAM) new_folder_name); + SetFocus(hwnd); + break; + case 2: + KillTimer(hwnd, idEvent); + /* Close dialog box */ + SendMessage(hwnd, WM_COMMAND, IDOK, 0); + break; + default: + break; + } +} + +/* + * Callback used by test_click_make_new_folder_button. It sets up a timer to + * simulate user input. */ static int CALLBACK create_new_folder_callback(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) @@ -73,10 +105,8 @@ static int CALLBACK create_new_folder_callback(HWND hwnd, UINT uMsg, switch (uMsg) { case BFFM_INITIALIZED: - /* Click "Make New Folder" button */ - SendMessage(hwnd, WM_COMMAND, IDD_MAKENEWFOLDER, 0); - /* Close dialog box */ - SendMessage(hwnd, WM_COMMAND, IDCANCEL, 0); + /* User input is simulated in timer callback */ + SetTimer(hwnd, 0, TIMER_WAIT_MS, make_new_folder_timer_callback); return TRUE; default: return FALSE; @@ -87,16 +117,19 @@ static int CALLBACK create_new_folder_callback(HWND hwnd, UINT uMsg, * Tests if clicking the "Make New Folder" button in a SHBrowseForFolder * dialog box creates a new folder. (Bug 17986). * - * The algorithm is: - * 1. Check that there is no "test_click_make_new_folder_button" folder. - * 2. Create a test folder called "test_click_make_new_folder_button". - * 3. Use the test folder as root for SHBrowseForFolder dialog box. - * 3. Hook up SHBrowseForFolder dialog box with callback. - * 4. Display SHBrowseForFolder dialog box. - * 5. Callback clicks "Make New Folder" button (by sending a message). - * 6. Callback closes SHBrowseForFolder dialog box. - * 7. Check that there is a new folder inside the test folder. - * 8. Remove the test folder and any subfolders. + * Here follows a description of what happens on W2K,Vista, W2K8, W7: + * When the "Make New Folder" button is clicked a new folder is created and + * inserted into the tree. The folder is given a default name that depends on + * the locale (e.g. "New Folder"). The folder name is selected and the dialog + * waits for the user to type in a new name. The folder is renamed when the user + * types in a name and presses enter. + * + * Note that XP and W2K3 do not select the folder name or wait for the user + * to type in a new folder name. This behavior is considered broken as most + * users would like to give the folder a name after creating it. The fact that + * it originally waited for the user to type in a new folder name(W2K), and then + * again was changed back wait for the new folder name(Vista, W2K8, W7), + * indicates that MS also believes that it was broken in XP and W2K3. */ static void test_click_make_new_folder_button(void) { @@ -107,6 +140,7 @@ static void test_click_make_new_folder_button(void) IShellFolder *test_folder_object; char test_folder_path[MAX_PATH]; WCHAR test_folder_pathW[MAX_PATH]; + CHAR new_folder_path[MAX_PATH]; char selected_folder[MAX_PATH]; const CHAR title[] = "test_click_make_new_folder_button"; int number_of_folders = -1; @@ -160,9 +194,16 @@ static void test_click_make_new_folder_button(void) pidl = SHBrowseForFolder(&bi); number_of_folders = get_number_of_folders(test_folder_path); - todo_wine ok(number_of_folders == 1 || broken(number_of_folders == 0) /* W98, W2K */, + todo_wine ok(number_of_folders == 1 || broken(number_of_folders == 0) /* W95, W98 */, "Clicking \"Make New Folder\" button did not result in a new folder.\n"); + /* There should be a new folder foo inside the test folder */ + strcpy(new_folder_path, test_folder_path); + strcat(new_folder_path, new_folder_name); + todo_wine ok(does_folder_or_file_exist(new_folder_path) + || broken(!does_folder_or_file_exist(new_folder_path)) /* W95, W98, XP, W2K3 */, + "The new folder did not get the name %s\n", new_folder_name); + /* Remove test folder and any subfolders created in this test */ shfileop.hwnd = NULL; shfileop.wFunc = FO_DELETE;

1 0

Misha Koshelev : d3dx9: Implement D3DXFVFFromDeclarator.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 5fa3a6cf78a71e363bcc2869b871a0521b9dee0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa3a6cf78a71e363bcc2869b… Author: Misha Koshelev <misha680(a)gmail.com> Date: Wed Sep 1 18:21:40 2010 -0500 d3dx9: Implement D3DXFVFFromDeclarator. --- dlls/d3dx9_36/mesh.c | 144 +++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 77 ++++++++++++++++++++++- 2 files changed, 216 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fa3a6cf78a71e363bcc2…

1 0

Jacek Caban : jscript: Rename DispatchEx to jsdisp_t to match jscript naming convention.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 8c2a548b546469365899a52e83139451a636dd3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2a548b546469365899a52e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 6 16:11:49 2010 +0200 jscript: Rename DispatchEx to jsdisp_t to match jscript naming convention. --- dlls/jscript/activex.c | 4 +- dlls/jscript/array.c | 48 ++++++++-------- dlls/jscript/bool.c | 10 ++-- dlls/jscript/date.c | 10 ++-- dlls/jscript/dispex.c | 106 ++++++++++++++++++------------------ dlls/jscript/engine.c | 22 ++++---- dlls/jscript/engine.h | 10 ++-- dlls/jscript/error.c | 28 +++++----- dlls/jscript/function.c | 44 ++++++++-------- dlls/jscript/global.c | 6 +- dlls/jscript/jscript.c | 2 +- dlls/jscript/jscript.h | 136 +++++++++++++++++++++++----------------------- dlls/jscript/jsutils.c | 6 +- dlls/jscript/math.c | 6 +- dlls/jscript/number.c | 10 ++-- dlls/jscript/object.c | 16 +++--- dlls/jscript/regexp.c | 28 +++++----- dlls/jscript/string.c | 24 ++++---- 18 files changed, 258 insertions(+), 258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c2a548b546469365899a…

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}Path.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 4a352bd78d1aebcce3bdece888fcb8532a11855c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a352bd78d1aebcce3bdece88… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Sep 5 12:57:48 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}Path. --- dlls/urlmon/tests/uri.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 28 +++++++++---------- 2 files changed, 78 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index cfd7a04..684a608 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4347,7 +4347,7 @@ static const uri_builder_test uri_builder_tests[] = { { {TRUE,"http",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,TRUE}, {TRUE,"::192.2.3.4",NULL,Uri_PROPERTY_HOST,S_OK,FALSE}, - {TRUE,NULL,NULL,Uri_PROPERTY_PATH,S_OK,TRUE} + {TRUE,NULL,NULL,Uri_PROPERTY_PATH,S_OK,FALSE} }, {FALSE}, 0,S_OK,TRUE, @@ -4504,6 +4504,70 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_UNKNOWN,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"test/test",NULL,Uri_PROPERTY_PATH,S_OK,FALSE}, + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com/test/test",S_OK}, + {"google.com",S_OK}, + {"http://google.com/test/test",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/test/test",S_OK}, + {"/test/test",S_OK}, + {"",S_FALSE}, + {"http://google.com/test/test",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "zip:testing/test",0,S_OK,FALSE, + { + {TRUE,"test",NULL,Uri_PROPERTY_PATH,S_OK,FALSE}, + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"zip:test",S_OK}, + {"",S_FALSE}, + {"zip:test",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"test",S_OK}, + {"test",S_OK}, + {"",S_FALSE}, + {"zip:test",S_OK}, + {"zip",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index b5e9df0..41c2343 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -88,6 +88,9 @@ typedef struct { WCHAR *password; DWORD password_len; + + WCHAR *path; + DWORD path_len; } UriBuilder; typedef struct { @@ -4318,6 +4321,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) heap_free(This->fragment); heap_free(This->host); heap_free(This->password); + heap_free(This->path); heap_free(This); } @@ -4480,19 +4484,11 @@ static HRESULT WINAPI UriBuilder_GetPath(IUriBuilder *iface, DWORD *pcchPath, LP UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchPath, ppwzPath); - if(!pcchPath) { - if(ppwzPath) - *ppwzPath = NULL; - return E_POINTER; - } - - if(!ppwzPath) { - *pcchPath = 0; - return E_POINTER; - } - - FIXME("(%p)->(%p %p)\n", This, pcchPath, ppwzPath); - return E_NOTIMPL; + if(!This->uri || This->uri->path_start == -1 || This->modified_props & Uri_HAS_PATH) + return get_builder_component(&This->path, &This->path_len, NULL, 0, ppwzPath, pcchPath); + else + return get_builder_component(&This->path, &This->path_len, This->uri->canon_uri+This->uri->path_start, + This->uri->path_len, ppwzPath, pcchPath); } static HRESULT WINAPI UriBuilder_GetPort(IUriBuilder *iface, BOOL *pfHasPort, DWORD *pdwPort) @@ -4605,8 +4601,10 @@ static HRESULT WINAPI UriBuilder_SetPassword(IUriBuilder *iface, LPCWSTR pwzNewV static HRESULT WINAPI UriBuilder_SetPath(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + + This->modified_props |= Uri_HAS_PATH; + return set_builder_component(&This->path, &This->path_len, pwzNewValue, 0); } static HRESULT WINAPI UriBuilder_SetPort(IUriBuilder *iface, BOOL fHasPort, DWORD dwNewValue)

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
86
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 September 2010