wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Aurimas Fišeras : notepad: Improve Lithuanian translation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 66d0ffe6c4367e1daff64016c34f560f573536b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d0ffe6c4367e1daff64016c… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Jun 27 15:59:00 2009 +0300 notepad: Improve Lithuanian translation. --- programs/notepad/Lt.rc | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc index ce289f2..c3ccfb9 100644 --- a/programs/notepad/Lt.rc +++ b/programs/notepad/Lt.rc @@ -29,7 +29,7 @@ MAIN_MENU MENU MENUITEM "&Naujas\tCtrl+N", CMD_NEW MENUITEM "&Atverti...\tCtrl+O", CMD_OPEN MENUITEM "&Išsaugoti\tCtrl+S", CMD_SAVE - MENUITEM "Išsaugoti k&aip...", CMD_SAVE_AS + MENUITEM "Išsaugoti &kaip...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "S&pausdinti...\tCtrl+P", CMD_PRINT MENUITEM "Puslapio &nuostatos...", CMD_PAGE_SETUP @@ -48,12 +48,12 @@ POPUP "&Taisa" { MENUITEM "&Pažymėti viską\tCtrl+A", CMD_SELECT_ALL MENUITEM "&Laikas/Data\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "Laužyti ilgas &eilutes", CMD_WRAP + MENUITEM "Skaidyti ilgas &eilutes", CMD_WRAP MENUITEM "Š&riftas...", CMD_FONT } POPUP "&Paieška" { MENUITEM "&Ieškoti...\tCtrl+F", CMD_SEARCH - MENUITEM "Ieškoti k&ito\tF3", CMD_SEARCH_NEXT + MENUITEM "Ieškoti ki&to\tF3", CMD_SEARCH_NEXT MENUITEM "Pa&keisti...\tCtrl+H", CMD_REPLACE } POPUP "&Žinynas" { @@ -61,7 +61,7 @@ POPUP "&Žinynas" { MENUITEM "&Paieška...", CMD_HELP_SEARCH MENUITEM "Pa&galba apie žinyną", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&Apie Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Apie užrašinę", CMD_HELP_ABOUT_NOTEPAD } } @@ -97,7 +97,7 @@ STRINGTABLE DISCARDABLE STRING_PAGESETUP_HEADERVALUE, "&f" STRING_PAGESETUP_FOOTERVALUE, "Puslapis &p" -STRING_NOTEPAD, "Notepad" +STRING_NOTEPAD, "Užrašinė" STRING_ERROR, "KLAIDA" STRING_WARNING, "ĮSPĖJIMAS" STRING_INFO, "Informacija" @@ -107,17 +107,17 @@ STRING_UNTITLED, "Be pavadinimo" STRING_ALL_FILES, "Visi failai (*.*)" STRING_TEXT_FILES_TXT, "Tekstiniai failai (*.txt)" -STRING_TOOLARGE, "Failas '%s' yra per didelis notepad programai.\n\ -Prašome naudoti kitą tekstų rengyklę." +STRING_TOOLARGE, "Failas „%s“ yra per didelis užrašinei.\n\ + Prašome naudoti kitą tekstų rengyklę." STRING_NOTEXT, "Jūs neįvedėte jokio teksto.\n\ -Prašome ką nors įvesti ir mėginti dar kartą" -STRING_DOESNOTEXIST, "Failas '%s'\nneegzistuoja\n\n\ -Ar norite sukurti naują failą?" -STRING_NOTSAVED, "Failas '%s'\nbuvo pakeistas\n\n\ -Ar norite išsaugoti pakeitimus?" -STRING_NOTFOUND, "Frazė '%s' nerasta." -STRING_OUT_OF_MEMORY, "Neužtenka atminties operacijai užbaigti.\ -\nNorėdami atlaisvinti atminties uždarykite vieną ar daugiau programų." + Prašome ką nors įvesti ir mėginti dar kartą" +STRING_DOESNOTEXIST, "Failas „%s“\nneegzistuoja\n\n\ + Ar norite sukurti naują failą?" +STRING_NOTSAVED, "Failas „%s“\nbuvo pakeistas\n\n\ + Ar norite išsaugoti pakeitimus?" +STRING_NOTFOUND, "Frazė „%s“ nerasta." +STRING_OUT_OF_MEMORY, "Neužtenka atminties operacijai užbaigti.\n\ + Norėdami atlaisvinti atminties uždarykite vieną ar daugiau programų." } #pragma code_page(default)

1 0

Aurimas Fišeras : wldap32: Add Lithuanian translation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: a6c2cd7a43ef1716277bd4e56b6fb9b28d84c5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c2cd7a43ef1716277bd4e56… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Jun 27 14:19:51 2009 +0300 wldap32: Add Lithuanian translation. --- dlls/wldap32/wldap32.rc | 1 + dlls/wldap32/wldap32_Lt.rc | 128 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/wldap32.rc b/dlls/wldap32/wldap32.rc index 50f9562..b27d8cd 100644 --- a/dlls/wldap32/wldap32.rc +++ b/dlls/wldap32/wldap32.rc @@ -28,6 +28,7 @@ #include "wldap32_Es.rc" #include "wldap32_Fr.rc" #include "wldap32_Ko.rc" +#include "wldap32_Lt.rc" #include "wldap32_Nl.rc" #include "wldap32_No.rc" #include "wldap32_Pl.rc" diff --git a/dlls/wldap32/wldap32_Lt.rc b/dlls/wldap32/wldap32_Lt.rc new file mode 100644 index 0000000..f4b39ae --- /dev/null +++ b/dlls/wldap32/wldap32_Lt.rc @@ -0,0 +1,128 @@ +/* + * Lithuanian resources for WLDAP32 + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "Sėkmė" + 1 "Operacijų klaida" + 2 "Protokolo klaida" + 3 "Viršytas skirtas laikas" + 4 "Viršyta dydžio riba" + 5 "Nelygu" + 6 "Lygu" + 7 "Tapatumo nustatymo metodas nerealizuotas" + 8 "Reikalingas stiprus tapatumo nustatymas" + 9 "Perdavimas (v2)" + 10 "Perdavimas" + 11 "Viršyta administravimo riba" + 12 "Nepasiekiamas kritinis plėtinys" + 13 "Reikalingas slaptumas" + 14 "" + 15 "" + 16 "Nėra tokio atributo" + 17 "Neapibrėžtas tipas" + 18 "Netinkamas atitikimas" + 19 "Ribojimų pažeidimas" + 20 "Atributas ar reikšmė egzistuoja" + 21 "Neteisinga sintaksė" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Nėra tokio objekto" + 33 "Alternatyviojo vardo problema" + 34 "Neteisinga DN sintaksė" + 35 "Objektas yra lapas" + 36 "Alternatyviojo vardo reikšmės nustatymo problema" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Netinkamas tapatumo nustatymas" + 49 "Neteisingi kredencialai" + 50 "Nepakanka teisių" + 51 "Užimtas" + 52 "Nepasiekiamas" + 53 "Nelinkęs aptarnauti" + 54 "Aptiktas ciklas" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Trūksta rikiavimo valdiklio" + 61 "Indekso rėžių klaida" + 62 "" + 63 "" + 64 "Įvardijimo pažeidimas" + 65 "Objekto klasės pažeidimas" + 66 "Leistina tik su lapu" + 67 "Neleistina su RDN" + 68 "Jau yra" + 69 "Negalimas objektų klasės modifikavimas" + 70 "Rezultatai per dideli" + 71 "Įtakoja daugelį DSA" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Kita" + 81 "Serveris nepasiekiamas" + 82 "Vietinė klaida" + 83 "Kodavimo klaida" + 84 "Dekodavimo klaida" + 85 "Baigėsi laikas" + 86 "Nežinomas tapatumo nustatymas" + 87 "Filtro klaida" + 88 "Nutraukta naudotojo" + 89 "Parametro klaida" + 90 "Trūksta atminties" + 91 "Nepavyko prisijungti prie LDAP serverio" + 92 "Operacija nepalaikoma šioje LDAP protokolo versijoje" + 93 "Nurodytas valdiklis nerastas pranešime" + 94 "Pranešime nėra rezultato" + 95 "Grąžinta daugiau rezultatų" + 96 "Aptiktas ciklas apdorojant perdavimus" + 97 "Viršyta perdavimo šuolių riba" +} + +#pragma code_page(default)

1 0

Aurimas Fišeras : shdoclc: Add Lithuanian translation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 15651b7b89270ea0d0f8cee4ec84acf65131f539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15651b7b89270ea0d0f8cee4e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Jun 26 22:04:34 2009 +0300 shdoclc: Add Lithuanian translation. --- dlls/shdoclc/Lt.rc | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/rsrc.rc | 1 + 2 files changed, 252 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15651b7b89270ea0d0f8c…

1 0

Eric Pouech : winhlp32: Fixed some cases where winhlp32 didn' t shutdown as expected.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: a99ab94cc5110d55f8aee0f314be9bff174615c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99ab94cc5110d55f8aee0f31… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 27 08:34:45 2009 +0200 winhlp32: Fixed some cases where winhlp32 didn't shutdown as expected. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 08d3875..56244d3 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1736,7 +1736,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) WINHELP_GetWindowInfo(hlpfile, wndname), show); /* Message loop */ - while (GetMessage(&msg, 0, 0, 0)) + while ((Globals.win_list || Globals.active_popup) && GetMessage(&msg, 0, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg);

1 0

Jacek Caban : urlmon: Added ObtainUserAgentString implementation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: cef7e04f18e28217c70e26db36f9e6ada4d5e683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef7e04f18e28217c70e26db3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 27 00:37:52 2009 +0200 urlmon: Added ObtainUserAgentString implementation. --- dlls/urlmon/session.c | 33 +++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 25 ------------------------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 3cee893..69f1aa1 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -631,6 +631,39 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf return S_OK; } +/************************************************************************** + * ObtainUserAgentString (URLMON.@) + */ +HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbSize) +{ + DWORD size; + HRESULT hres = E_FAIL; + + TRACE("(%d %p %p)\n", dwOption, pcszUAOut, cbSize); + + if(!pcszUAOut || !cbSize) + return E_INVALIDARG; + + EnterCriticalSection(&session_cs); + + ensure_useragent(); + if(user_agent) { + size = WideCharToMultiByte(CP_ACP, 0, user_agent, -1, NULL, 0, NULL, NULL); + + if(size <= *cbSize) { + WideCharToMultiByte(CP_ACP, 0, user_agent, -1, pcszUAOut, *cbSize, NULL, NULL); + hres = S_OK; + }else { + hres = E_OUTOFMEMORY; + } + + *cbSize = size; + } + + LeaveCriticalSection(&session_cs); + return hres; +} + void free_session(void) { heap_free(user_agent); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 0d5bc2a..2e624fb 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -362,31 +362,6 @@ HRESULT WINAPI DllRegisterServerEx(void) return E_FAIL; } -static const CHAR Agent[] = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)"; - -/************************************************************************** - * ObtainUserAgentString (URLMON.@) - */ -HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbSize) -{ - FIXME("(%d, %p, %p): stub\n", dwOption, pcszUAOut, cbSize); - - if (pcszUAOut == NULL || cbSize == NULL) - return E_INVALIDARG; - - if (*cbSize < sizeof(Agent)) - { - *cbSize = sizeof(Agent); - return E_OUTOFMEMORY; - } - - if (sizeof(Agent) < *cbSize) - *cbSize = sizeof(Agent); - lstrcpynA(pcszUAOut, Agent, *cbSize); - - return S_OK; -} - /************************************************************************** * IsValidURL (URLMON.@) *

1 0

Jacek Caban : urlmon: Added user agent tests.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 3700d27960379887bda1feed84f90d47f838271e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3700d27960379887bda1feed8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 27 00:37:34 2009 +0200 urlmon: Added user agent tests. --- dlls/urlmon/tests/misc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 443fd82..6436cd7 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1155,9 +1155,11 @@ static void test_UrlMkGetSessionOption(void) ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding); } -static void test_ObtainUserAgentString(void) +static void test_user_agent(void) { static const CHAR expected[] = "Mozilla/4.0 (compatible; MSIE "; + static char test_str[] = "test"; + static char test2_str[] = "test\0test"; static CHAR str[3]; LPSTR str2 = NULL; HRESULT hres; @@ -1209,6 +1211,84 @@ static void test_ObtainUserAgentString(void) ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); ok(size == saved, "size=%d, expected %d\n", size, saved); } + + size = 0; + hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, NULL, 0, &size, 0); + ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(size, "size == 0\n"); + + size = 0xdeadbeef; + hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, NULL, 1000, &size, 0); + ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(size, "size == 0\n"); + + saved = size; + size = 0; + hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved+10, &size, 0); + ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(size == saved, "size = %d, expected %d\n", size, saved); + ok(sizeof(expected) <= strlen(str2) && !memcmp(expected, str2, sizeof(expected)-1), + "user agent was \"%s\", expected to start with \"%s\"\n", + str2, expected); + + size = 0; + str2[0] = 0; + hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0); + ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(size == saved, "size = %d, expected %d\n", size, saved); + ok(sizeof(expected) <= strlen(str2) && !memcmp(expected, str2, sizeof(expected)-1), + "user agent was \"%s\", expected to start with \"%s\"\n", + str2, expected); + + size = saved; + str2[0] = 0; + hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved-1, &size, 0); + ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(size == saved, "size = %d, expected %d\n", size, saved); + ok(!str2[0], "buf changed\n"); + + size = saved; + str2[0] = 0; + hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, NULL, 0); + ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(!str2[0], "buf changed\n"); + + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, test_str, sizeof(test_str), 0); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); + + size = 0; + str2[0] = 0; + hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0); + ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(size == sizeof(test_str) && !memcmp(str2, test_str, sizeof(test_str)), "wrong user agent\n"); + + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, test2_str, sizeof(test2_str), 0); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); + + size = 0; + str2[0] = 0; + hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0); + ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(size == sizeof(test_str) && !memcmp(str2, test_str, sizeof(test_str)), "wrong user agent\n"); + + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, test_str, 2, 0); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); + + size = 0; + str2[0] = 0; + hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0); + ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(size == 3 && !strcmp(str2, "te"), "wrong user agent\n"); + + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, test_str, 0, 0); + ok(hres == E_INVALIDARG, "UrlMkSetSessionOption failed: %08x\n", hres); + + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, NULL, sizeof(test_str), 0); + ok(hres == E_INVALIDARG, "UrlMkSetSessionOption failed: %08x\n", hres); + + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, NULL, 0, 0); + ok(hres == E_INVALIDARG, "UrlMkSetSessionOption failed: %08x\n", hres); + HeapFree(GetProcessHeap(), 0, str2); } @@ -1277,7 +1357,7 @@ START_TEST(misc) test_ReleaseBindInfo(); test_CopyStgMedium(); test_UrlMkGetSessionOption(); - test_ObtainUserAgentString(); + test_user_agent(); test_MkParseDisplayNameEx(); OleUninitialize();

1 0

Jacek Caban : urlmon: Added UrlMkSetSessionOption(URLMON_OPTION_USERAGENT) implementation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: e237c127c1004e82e92d9c31352f7eea2d697060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e237c127c1004e82e92d9c313… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 27 00:37:11 2009 +0200 urlmon: Added UrlMkSetSessionOption(URLMON_OPTION_USERAGENT) implementation. --- dlls/urlmon/session.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 11 ----------- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 60402ad..3cee893 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -587,6 +587,50 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf return E_INVALIDARG; } +/************************************************************************** + * UrlMkSetSessionOption (URLMON.@) + */ +HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, + DWORD Reserved) +{ + TRACE("(%x %p %x)\n", dwOption, pBuffer, dwBufferLength); + + switch(dwOption) { + case URLMON_OPTION_USERAGENT: { + LPWSTR new_user_agent; + char *buf = pBuffer; + DWORD len, size; + + if(!pBuffer || !dwBufferLength) + return E_INVALIDARG; + + for(len=0; len<dwBufferLength && buf[len]; len++); + + TRACE("Setting user agent %s\n", debugstr_an(buf, len)); + + size = MultiByteToWideChar(CP_ACP, 0, buf, len, NULL, 0); + new_user_agent = heap_alloc((size+1)*sizeof(WCHAR)); + if(!new_user_agent) + return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, buf, len, new_user_agent, size); + new_user_agent[size] = 0; + + EnterCriticalSection(&session_cs); + + heap_free(user_agent); + user_agent = new_user_agent; + + LeaveCriticalSection(&session_cs); + break; + } + default: + FIXME("Unknown option %x\n", dwOption); + return E_INVALIDARG; + } + + return S_OK; +} + void free_session(void) { heap_free(user_agent); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 62fe4ec..0d5bc2a 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -362,17 +362,6 @@ HRESULT WINAPI DllRegisterServerEx(void) return E_FAIL; } -/************************************************************************** - * UrlMkSetSessionOption (URLMON.@) - */ -HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, - DWORD Reserved) -{ - FIXME("(%#x, %p, %#x): stub\n", dwOption, pBuffer, dwBufferLength); - - return S_OK; -} - static const CHAR Agent[] = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)"; /**************************************************************************

1 0

Jacek Caban : urlmon: Added UrlMkSetSessionOption(URLMON_OPTION_USERAGENT) implementation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 1880de044c615e9fa344f88f37b8dd423702214d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1880de044c615e9fa344f88f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 27 00:31:39 2009 +0200 urlmon: Added UrlMkSetSessionOption(URLMON_OPTION_USERAGENT) implementation. --- dlls/urlmon/session.c | 77 ++++++++++++++++++++++++++++++++++++++++---- dlls/urlmon/urlmon_main.c | 1 + dlls/urlmon/urlmon_main.h | 1 + 3 files changed, 72 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 933202c..60402ad 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -52,6 +52,13 @@ static CRITICAL_SECTION_DEBUG session_cs_dbg = }; static CRITICAL_SECTION session_cs = { &session_cs_dbg, -1, 0, 0, 0, 0 }; +static const WCHAR internet_settings_keyW[] = + {'S','O','F','T','W','A','R','E', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; + static name_space *find_name_space(LPCWSTR protocol) { name_space *iter; @@ -482,15 +489,9 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding) DWORD size = sizeof(DWORD), res, type; HKEY hkey; - static const WCHAR wszKeyName[] = - {'S','O','F','T','W','A','R','E', - '\\','M','i','c','r','o','s','o','f','t', - '\\','W','i','n','d','o','w','s', - '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', - '\\','I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; static const WCHAR wszUrlEncoding[] = {'U','r','l','E','n','c','o','d','i','n','g',0}; - res = RegOpenKeyW(root, wszKeyName, &hkey); + res = RegOpenKeyW(root, internet_settings_keyW, &hkey); if(res != ERROR_SUCCESS) return FALSE; @@ -500,6 +501,37 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding) return res == ERROR_SUCCESS; } +static LPWSTR user_agent; + +static void ensure_useragent(void) +{ + DWORD size = sizeof(DWORD), res, type; + HKEY hkey; + + static const WCHAR user_agentW[] = {'U','s','e','r',' ','A','g','e','n','t',0}; + + if(user_agent) + return; + + res = RegOpenKeyW(HKEY_CURRENT_USER, internet_settings_keyW, &hkey); + if(res != ERROR_SUCCESS) + return; + + res = RegQueryValueExW(hkey, user_agentW, NULL, &type, NULL, &size); + if(res == ERROR_SUCCESS && type == REG_SZ) { + user_agent = heap_alloc(size); + res = RegQueryValueExW(hkey, user_agentW, NULL, &type, (LPBYTE)user_agent, &size); + if(res != ERROR_SUCCESS) { + heap_free(user_agent); + user_agent = NULL; + } + }else { + WARN("Could not find User Agent value: %u\n", res); + } + + RegCloseKey(hkey); +} + HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD* pdwBufferLength, DWORD dwReserved) { @@ -509,6 +541,32 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf WARN("dwReserved = %d\n", dwReserved); switch(dwOption) { + case URLMON_OPTION_USERAGENT: { + HRESULT hres = E_OUTOFMEMORY; + DWORD size; + + if(!pdwBufferLength) + return E_INVALIDARG; + + EnterCriticalSection(&session_cs); + + ensure_useragent(); + if(user_agent) { + size = WideCharToMultiByte(CP_ACP, 0, user_agent, -1, NULL, 0, NULL, NULL); + *pdwBufferLength = size; + if(size <= dwBufferLength) { + if(pBuffer) + WideCharToMultiByte(CP_ACP, 0, user_agent, -1, pBuffer, size, NULL, NULL); + else + hres = E_INVALIDARG; + } + } + + LeaveCriticalSection(&session_cs); + + /* Tests prove that we have to return E_OUTOFMEMORY on success. */ + return hres; + } case URLMON_OPTION_URL_ENCODING: { DWORD encoding = 0; @@ -528,3 +586,8 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf return E_INVALIDARG; } + +void free_session(void) +{ + heap_free(user_agent); +} diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 6e51db5..62fe4ec 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -139,6 +139,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) FreeLibrary(hCabinet); hCabinet = NULL; init_session(FALSE); + free_session(); free_tls_list(); URLMON_hInstance = 0; break; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index e5501e0..1b5d8d5 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -63,6 +63,7 @@ HRESULT get_protocol_handler(LPCWSTR,CLSID*,BOOL*,IClassFactory**); IInternetProtocol *get_mime_filter(LPCWSTR); BOOL is_registered_protocol(LPCWSTR); void register_urlmon_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL); +void free_session(void); HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv);

1 0

Jacek Caban : urlmon: Set user agent registry.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 9fed06b057d7ff1a019077689b2964cd23b7925e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fed06b057d7ff1a019077689… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 27 00:29:14 2009 +0200 urlmon: Set user agent registry. --- dlls/urlmon/urlmon.inf | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/urlmon.inf b/dlls/urlmon/urlmon.inf index 63d88c4..4d781c7 100644 --- a/dlls/urlmon/urlmon.inf +++ b/dlls/urlmon/urlmon.inf @@ -3,11 +3,11 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg +AddReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg, Misc.Reg [UnregisterDll] -DelReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg +DelReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg, Misc.Reg [Classes.Reg] @@ -460,9 +460,16 @@ HKCU,"%ZONES_UNTRUSTED%","1E05",0x10003,0x10000 HKLM,"%ZONES_UNTRUSTED%","1E05",0x10003,0x10000 +[Misc.Reg] +HKCU,"%INTERNET_SETTINGS%","User Agent",,"%USER_AGENT%" + + [Strings] MODULE="urlmon.dll" +USER_AGENT="Mozilla/4.0 (compatible; MSIE 8.0; Win32)" +INTERNET_SETTINGS="Software\Microsoft\Windows\CurrentVersion\Internet Settings" + PATH_ZONEMAP="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap" PATH_ZONEMAP_PROTOCOLS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\ProtocolDefaults" PATH_ZONEMAP_DOMAINS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\Domains"

1 0

Jacek Caban : urlmon: Don' t depend on QueryService returning NULL on failure.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 1e9c99671149601329e0abae6e5528132672195a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9c99671149601329e0abae6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 27 00:28:30 2009 +0200 urlmon: Don't depend on QueryService returning NULL on failure. --- dlls/urlmon/bindctx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 7438383..fe80456 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -51,9 +51,9 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret); if(FAILED(hres) && This->serv_prov) - IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); + hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); - return ret; + return SUCCEEDED(hres) ? ret : NULL; } #define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface)

1 0

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 June 2009