wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Louis Lenders : shell32: Define icon resource 319.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 51beb857bd99edecbeb4eecf0df50902d903a0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51beb857bd99edecbeb4eecf0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Aug 15 22:11:02 2011 +0200 shell32: Define icon resource 319. --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index eae541d..9eeaea7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -353,6 +353,10 @@ IDI_SHELL_MY_DOCUMENTS ICON mydocs.ico /* @makedep: mydocs.ico */ IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: mydocs.ico */ +IDI_SHELL_FAVORITES ICON mydocs.ico + /* @makedep: idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 526b984..1c3a381 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -217,6 +217,7 @@ #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 #define IDI_SHELL_MY_DOCUMENTS 235 +#define IDI_SHELL_FAVORITES 319 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170

1 0

Hans Leidekker : programs: Add a stub FontCache3.0.0.0 service.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 8959961b425c739247f7d3ea7a56577f56cb29a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8959961b425c739247f7d3ea7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 24 10:23:57 2011 +0200 programs: Add a stub FontCache3.0.0.0 service. --- configure | 1 + configure.ac | 1 + programs/presentationfontcache/Makefile.in | 9 +++ programs/presentationfontcache/main.c | 99 ++++++++++++++++++++++++++++ tools/wine.inf.in | 12 ++++ 5 files changed, 122 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 1497bdb..4d5dcb3 100755 --- a/configure +++ b/configure @@ -15312,6 +15312,7 @@ wine_fn_config_program notepad enable_notepad install,installbin,manpage,po wine_fn_config_program oleview enable_oleview install,po wine_fn_config_program ping enable_ping install wine_fn_config_program plugplay enable_plugplay install +wine_fn_config_program presentationfontcache enable_presentationfontcache install wine_fn_config_program progman enable_progman install,po wine_fn_config_program reg enable_reg install,po wine_fn_config_program regedit enable_regedit install,installbin,manpage,po diff --git a/configure.ac b/configure.ac index 11d22b9..ae89108 100644 --- a/configure.ac +++ b/configure.ac @@ -2926,6 +2926,7 @@ WINE_CONFIG_PROGRAM(notepad,,[install,installbin,manpage,po]) WINE_CONFIG_PROGRAM(oleview,,[install,po]) WINE_CONFIG_PROGRAM(ping,,[install]) WINE_CONFIG_PROGRAM(plugplay,,[install]) +WINE_CONFIG_PROGRAM(presentationfontcache,,[install]) WINE_CONFIG_PROGRAM(progman,,[install,po]) WINE_CONFIG_PROGRAM(reg,,[install,po]) WINE_CONFIG_PROGRAM(regedit,,[install,installbin,manpage,po]) diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in new file mode 100644 index 0000000..edf8b38 --- /dev/null +++ b/programs/presentationfontcache/Makefile.in @@ -0,0 +1,9 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = presentationfontcache.exe +APPMODE = -mconsole -municode +IMPORTS = advapi32 + +C_SRCS = \ + main.c + +@MAKE_PROG_RULES@ diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c new file mode 100644 index 0000000..b17a177 --- /dev/null +++ b/programs/presentationfontcache/main.c @@ -0,0 +1,99 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fontcache); + +static WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e','3','.','0','.','0','.','0',0}; + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + WINE_TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + WINE_FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +{ + SERVICE_STATUS status; + + WINE_TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( fontcacheW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + WINE_TRACE( "service stopped\n" ); +} + +int wmain( int argc, WCHAR *argv[] ) +{ + static const SERVICE_TABLE_ENTRYW service_table[] = + { + { fontcacheW, ServiceMain }, + { NULL, NULL } + }; + + StartServiceCtrlDispatcherW( service_table ); + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 77c9d4d..af19c90 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -131,6 +131,7 @@ AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService +AddService=FontCache3.0.0.0,0,FontCacheService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -140,6 +141,7 @@ AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService +AddService=FontCache3.0.0.0,0,FontCacheService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -149,6 +151,7 @@ AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService +AddService=FontCache3.0.0.0,0,FontCacheService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2576,6 +2579,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,Microsoft.NET\Framework\v2.0.50727,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,fusion.dll 10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe +10,Microsoft.NET\Framework\v3.0\wpf,presentationfontcache.exe 10,Microsoft.NET\Framework\v4.0.30319,ngen.exe 10,Microsoft.NET\Framework\v4.0.30319,fusion.dll 11,gecko\plugin,npmshtml.dll @@ -3028,6 +3032,14 @@ ServiceType=32 StartType=2 ErrorControl=1 +[FontCacheService] +Description="Windows Presentation Foundation font cache service" +DisplayName="Windows Presentation Foundation Font Cache 3.0.0.0" +ServiceBinary="%10%\Microsoft.Net\Framework\v3.0\wpf\presentationfontcache.exe" +ServiceType=16 +StartType=3 +ErrorControl=1 + [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: da0ab1bf324300a6c2f2f97ba94dae3a0d9479f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0ab1bf324300a6c2f2f97ba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 23 23:45:06 2011 +0200 po: Update German translation. --- po/de.po | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index d3e5c12..ae3fdb9 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-08-13 16:35+0200\n" +"PO-Revision-Date: 2011-08-23 23:41+0200\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2239,13 +2239,8 @@ msgid "&Favorites" msgstr "&Favoriten" #: ieframe.rc:52 regedit.rc:73 -#, fuzzy msgid "&Add to Favorites..." -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Zu den Favoriten hinzufügen...\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Zu den Favoriten &hinzufügen..." +msgstr "Zu den Favoriten &hinzufügen..." #: ieframe.rc:55 shell32.rc:125 clock.rc:41 notepad.rc:57 oleview.rc:69 #: progman.rc:52 regedit.rc:76 taskmgr.rc:87 winefile.rc:85 winemine.rc:48 @@ -9033,21 +9028,19 @@ msgstr "&CoCreateInstance Flag" #: oleview.rc:41 msgid "&In-process server" -msgstr "" +msgstr "&In-Prozess Server" #: oleview.rc:42 msgid "In-process &handler" -msgstr "" +msgstr "In-Prozess &Handler" #: oleview.rc:43 -#, fuzzy msgid "&Local server" -msgstr "Lokaler Fehler" +msgstr "&Lokaler Server" #: oleview.rc:44 -#, fuzzy msgid "&Remote server" -msgstr "&Entfernen" +msgstr "&Entfernter Server" #: oleview.rc:47 msgid "View &Type information" @@ -9199,21 +9192,19 @@ msgstr "Programm-Information, -Version und -Copyright anzeigen" #: oleview.rc:113 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "" +msgstr "Für Aufruf von CoGetClassObject nach In-Prozess Server fragen" #: oleview.rc:114 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "" +msgstr "Für Aufruf von CoGetClassObject nach In-Prozess Handler fragen" #: oleview.rc:115 -#, fuzzy msgid "Ask for a local server when calling CoGetClassObject" -msgstr "CLSCTX_LOCAL_SERVER für Aufruf von CoGetClassObject benutzen" +msgstr "Für Aufruf von CoGetClassObject nach lokalem Server fragen" #: oleview.rc:116 -#, fuzzy msgid "Ask for a remote server when calling CoGetClassObject" -msgstr "CLSCTX_LOCAL_SERVER für Aufruf von CoGetClassObject benutzen" +msgstr "Für Aufruf von CoGetClassObject nach entferntem Server fragen" #: oleview.rc:128 msgid "ObjectClasses" @@ -10830,7 +10821,7 @@ msgstr "Inaktiver Titelleistentext" #: winecfg.rc:133 msgid "Message Box Text" -msgstr "Message Box Text" +msgstr "Dialogfeldtext" #: winecfg.rc:134 msgid "Application Workspace" @@ -11401,7 +11392,7 @@ msgstr "&System\tStrg+1" #: wordpad.rc:88 msgid "&Pale yellow\tCtrl+2" -msgstr "&PostIt-Notiz\tStrg+2" +msgstr "&Blassgelb\tStrg+2" #: wordpad.rc:93 msgid "&About Wine Wordpad"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: d165ff6612427a61ea82ece27d0ba061a3edb597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d165ff6612427a61ea82ece27… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Aug 23 21:35:19 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/po/lt.po b/po/lt.po index d6838af..75554ac 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-08-01 21:57+0300\n" +"PO-Revision-Date: 2011-08-23 21:32+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -8765,13 +8765,12 @@ msgstr "" "Prašome naudoti kitą tekstų rengyklę." #: notepad.rc:81 -#, fuzzy msgid "" "You did not enter any text.\n" "Please type something and try again." msgstr "" "Jūs neįvedėte jokio teksto.\n" -"Prašome ką nors įvesti ir mėginti dar kartą" +"Prašome ką nors įvesti ir mėginti dar kartą." #: notepad.rc:83 msgid "" @@ -8861,21 +8860,19 @@ msgstr "&CoCreateInstance žymos bitai" #: oleview.rc:41 msgid "&In-process server" -msgstr "" +msgstr "&Serveris procese" #: oleview.rc:42 msgid "In-process &handler" -msgstr "" +msgstr "&Doroklė procese" #: oleview.rc:43 -#, fuzzy msgid "&Local server" -msgstr "Vietinė klaida" +msgstr "&Vietinis serveris" #: oleview.rc:44 -#, fuzzy msgid "&Remote server" -msgstr "Pa&šalinti" +msgstr "&Nutolęs serveris" #: oleview.rc:47 msgid "View &Type information" @@ -9020,21 +9017,19 @@ msgstr "Parodo programos informaciją, versijos numerį ir autoriaus teises" #: oleview.rc:113 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "" +msgstr "Prašyti serverio procese, kai kreipiamasi į CoGetClassObject" #: oleview.rc:114 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "" +msgstr "Prašyti doroklės procese, kai kreipiamasi į CoGetClassObject" #: oleview.rc:115 -#, fuzzy msgid "Ask for a local server when calling CoGetClassObject" -msgstr "Naudoti CLSCTX_LOCAL_SERVER iškviečiant CoGetClassObject" +msgstr "Prašyti vietinio serverio, kai kreipiamasi į CoGetClassObject" #: oleview.rc:116 -#, fuzzy msgid "Ask for a remote server when calling CoGetClassObject" -msgstr "Naudoti CLSCTX_LOCAL_SERVER iškviečiant CoGetClassObject" +msgstr "Prašyti nutolusio serverio, kai kreipiamasi į CoGetClassObject" #: oleview.rc:128 msgid "ObjectClasses"

1 0

Alexandre Julliard : kernel32/nls: Generate some plausible data for LOCALE_SNATIVEDISPLAYNAME.
by Alexandre Julliard 24 Aug '11

24 Aug '11

1 0

Nikolay Sivov : kernel32/nls: Added placeholder for LOCALE_SNATIVEDISPLAYNAME, header updated with new locale entries.
by Alexandre Julliard 24 Aug '11

24 Aug '11

1 0

Damjan Jovanovic : winemenubuilder: Use the command from the "open" verb.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 3c7b08be2703233408612f241920fc9772e52b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7b08be2703233408612f241… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Aug 24 04:47:07 2011 +0200 winemenubuilder: Use the command from the "open" verb. --- programs/winemenubuilder/winemenubuilder.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e6dc504..f42f3b1 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -974,6 +974,7 @@ end: static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) { + static const WCHAR openW[] = {'o','p','e','n',0}; WCHAR *extension; WCHAR *icon = NULL; WCHAR *comma; @@ -999,7 +1000,7 @@ static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) } else { - executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, NULL); + executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, openW); if (executable) hr = open_icon(executable, 0, FALSE, ppStream); } @@ -2612,7 +2613,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package if (executableW) openWithIconA = extract_icon(executableW, 0, NULL, FALSE); - friendlyAppNameW = assoc_query(ASSOCSTR_FRIENDLYAPPNAME, extensionW, NULL); + friendlyAppNameW = assoc_query(ASSOCSTR_FRIENDLYAPPNAME, extensionW, openW); if (friendlyAppNameW) { friendlyAppNameA = wchars_to_utf8_chars(friendlyAppNameW);

1 0

Thomas Mullaly : urlmon/tests: Added tests for MapUrlToZoneEx2.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: efe68dcde125b90ffd525eb9ddc8ad5708f58cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe68dcde125b90ffd525eb9d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Aug 21 20:44:40 2011 -0400 urlmon/tests: Added tests for MapUrlToZoneEx2. --- dlls/urlmon/tests/sec_mgr.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2ba9f0c..3d630b8 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1609,6 +1609,88 @@ static void test_InternetGetSecurityUrlEx_Pluggable(void) if(uri) IUri_Release(uri); } +static const struct { + const char *uri; + DWORD create_flags; + HRESULT map_hres; + DWORD zone; + BOOL map_todo; +} sec_mgr_ex2_tests[] = { + {"res://mshtml.dll/blank.htm",0,S_OK,URLZONE_LOCAL_MACHINE,TRUE}, + {"index.htm",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET,TRUE}, + {"file://c:\\Index.html",0,0,URLZONE_LOCAL_MACHINE,TRUE}, + {"http://www.zone3.winetest/",0,0,URLZONE_INTERNET,TRUE}, + {"about:blank",0,0,URLZONE_INTERNET,TRUE}, + {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET,TRUE} +}; + +static void test_SecurityManagerEx2(void) +{ + HRESULT hres; + DWORD i, zone; + IInternetSecurityManager *sec_mgr; + IInternetSecurityManagerEx2 *sec_mgr2; + IUri *uri = NULL; + + if(!pCreateUri) { + win_skip("Skipping SecurityManagerEx2, IE is too old\n"); + return; + } + + trace("Testing SecurityManagerEx2...\n"); + + hres = pCoInternetCreateSecurityManager(NULL, &sec_mgr, 0); + ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres); + + hres = IInternetSecurityManager_QueryInterface(sec_mgr, &IID_IInternetSecurityManagerEx2, (void**)&sec_mgr2); + ok(hres == S_OK, "QueryInterface(IID_IInternetSecurityManagerEx2) failed: %08x\n", hres); + + zone = 0xdeadbeef; + + hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, NULL, &zone, 0, NULL, NULL); + todo_wine ok(hres == E_INVALIDARG, "MapUrlToZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); + todo_wine ok(zone == URLZONE_INVALID, "zone was %d\n", zone); + + hres = pCreateUri(url5, 0, 0, &uri); + ok(hres == S_OK, "CreateUri failed: %08x\n", hres); + + hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, NULL, 0, NULL, NULL); + todo_wine ok(hres == E_INVALIDARG, "MapToUrlZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); + + IUri_Release(uri); + + for(i = 0; i < sizeof(sec_mgr_ex2_tests)/sizeof(sec_mgr_ex2_tests[0]); ++i) { + LPWSTR uriW = a2w(sec_mgr_ex2_tests[i].uri); + + uri = NULL; + zone = URLZONE_INVALID; + + hres = pCreateUri(uriW, sec_mgr_ex2_tests[i].create_flags, 0, &uri); + ok(hres == S_OK, "CreateUri returned %08x on test %d\n", hres, i); + + hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL); + if(sec_mgr_ex2_tests[i].map_todo) { + todo_wine + ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x on test %d\n", + hres, sec_mgr_ex2_tests[i].map_hres, i); + todo_wine + ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d on test %d\n", sec_mgr_ex2_tests[i].zone, + zone, i); + } else { + ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x on test %d\n", + hres, sec_mgr_ex2_tests[i].map_hres, i); + ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d on test %d\n", sec_mgr_ex2_tests[i].zone, + zone, i); + } + + heap_free(uriW); + IUri_Release(uri); + } + + IInternetSecurityManagerEx2_Release(sec_mgr2); + IInternetSecurityManager_Release(sec_mgr); +} + START_TEST(sec_mgr) { HMODULE hurlmon; @@ -1648,6 +1730,7 @@ START_TEST(sec_mgr) } test_SecurityManager(); + test_SecurityManagerEx2(); test_polices(); test_zone_domains(); test_CoInternetCreateZoneManager();

1 0

Thomas Mullaly : urlmon: Added stubs for IInternetSecurityManagerEx{2}.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 912aa4a49910bb4d590072fb6197f81457b63f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=912aa4a49910bb4d590072fb6… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Aug 20 23:58:44 2011 -0400 urlmon: Added stubs for IInternetSecurityManagerEx{2}. --- dlls/urlmon/sec_mgr.c | 111 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 82 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=912aa4a49910bb4d59007…

1 0

Thomas Mullaly : include: Added declarations for IInternetSecurityManagerEx and IInternetSecurityManagerEx2 .
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 309af7274281b90d81d70b73f0da2994dc9e6cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=309af7274281b90d81d70b73f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Aug 20 18:42:32 2011 -0400 include: Added declarations for IInternetSecurityManagerEx and IInternetSecurityManagerEx2. --- include/urlmon.idl | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index a8a0a71..bbe85f0 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -28,6 +28,7 @@ cpp_quote("#undef SetPort") cpp_quote("#endif") interface IInternetProtocolSink; +interface IUri; /***************************************************************************** * IInternet interface @@ -1067,6 +1068,76 @@ cpp_quote("#define MAX_SIZE_SECURITY_ID 512") } /***************************************************************************** + * IInternetSecurityManagerEx interface + */ +cpp_quote("#define SID_SInternetSecurityManagerEx IID_IInternetSecurityManagerEx") + +[ + object, + uuid(f164edf1-cc7c-4f0d-9a94-34222625C393), + pointer_default(unique) +] +interface IInternetSecurityManagerEx : IInternetSecurityManager +{ + HRESULT ProcessUrlActionEx( + [in] LPCWSTR pwszUrl, + [in] DWORD dwAction, + [out] BYTE *pPolicy, + [in] DWORD cbPolicy, + [in] BYTE *pContext, + [in] DWORD cbContext, + [in] DWORD dwFlags, + [in] DWORD dwReserved, + [out] DWORD *pdwOutFlags); +} + +/***************************************************************************** + * IInternetSecurityManagerEx2 interface + */ +cpp_quote("#define SID_SInternetSecurityManagerEx2 IID_IInternetSecurityManagerEx2") + +[ + object, + uuid(f1e50292-a795-4117-8e09-2b560a72ac60), + pointer_default(unique) +] +interface IInternetSecurityManagerEx2 : IInternetSecurityManagerEx +{ + HRESULT MapUrlToZoneEx2( + [in] IUri *pUri, + [out] DWORD *pdwZone, + [in] DWORD dwFlags, + [out] LPWSTR *ppwszMappedUrl, + [out] DWORD *pdwOutFlags); + + HRESULT ProcessUrlActionEx2( + [in] IUri *pUri, + [in] DWORD dwAction, + [out] BYTE *pPolicy, + [in] DWORD cbPolicy, + [in] BYTE *pContext, + [in] DWORD cbContext, + [in] DWORD dwFlags, + [in] DWORD_PTR dwReserved, + [out] DWORD *pdwOutFlags); + + HRESULT GetSecurityIdEx2( + [in] IUri *pUri, + [out] BYTE *pbSecurityId, + [in, out] DWORD *pcbSecurityId, + [in] DWORD_PTR dwReserved); + + HRESULT QueryCustomPolicyEx2( + [in] IUri *pUri, + [in] REFGUID guidKey, + [out] BYTE **ppPolicy, + [out] DWORD *pcbPolicy, + [in] BYTE *pContext, + [in] DWORD cbContext, + [in] DWORD_PTR dwReserved); +} + +/***************************************************************************** * IInternetHostSecurityManager interface */ cpp_quote("#define SID_SInternetHostSecurityManager IID_IInternetHostSecurityManager")

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
77
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 August 2011