October 2007 - Wine-commits

Andrey Turkin : libwine: Emulate MS linker stub for builtin dlls.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: fa0524a4144112ce2b6c432fcec47232e7b92eeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0524a4144112ce2b6c432fc… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 8 21:42:16 2007 +0400 libwine: Emulate MS linker stub for builtin dlls. --- libs/wine/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index e6fcaae..2f78248 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -352,8 +352,8 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) /* Build the DOS and NT headers */ dos->e_magic = IMAGE_DOS_SIGNATURE; - dos->e_cblp = sizeof(*dos); - dos->e_cp = 1; + dos->e_cblp = 0x90; + dos->e_cp = 3; dos->e_cparhdr = (sizeof(*dos)+0xf)/0x10; dos->e_minalloc = 0; dos->e_maxalloc = 0xffff;

1 0

Mikolaj Zalewski : ole32: OleIsRunning should return TRUE if the class doesn' t implement IRunnableObject.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 01e7891d4816321df2d8cf508a41c4e0fe03d215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e7891d4816321df2d8cf508… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Oct 8 16:32:58 2007 -0700 ole32: OleIsRunning should return TRUE if the class doesn't implement IRunnableObject. --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/ole2.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e8793fc..cc12912 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2515,7 +2515,7 @@ BOOL WINAPI OleIsRunning(LPOLEOBJECT pObject) hr = IOleObject_QueryInterface(pObject, &IID_IRunnableObject, (void **)&pRunnable); if (FAILED(hr)) - return FALSE; + return TRUE; running = IRunnableObject_IsRunning(pRunnable); IRunnableObject_Release(pRunnable); return running; diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 73378dd..6732c13 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -46,6 +46,9 @@ static const CLSID CLSID_WineTest = static char const * const *expected_method_list; +BOOL g_showRunnable = TRUE; +BOOL g_isRunning = TRUE; + #define CHECK_EXPECTED_METHOD(method_name) \ do { \ trace("%s\n", method_name); \ @@ -70,7 +73,7 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v *ppv = &OleObjectPersistStg; else if (IsEqualIID(riid, &IID_IOleCache)) *ppv = cache; - else if (IsEqualIID(riid, &IID_IRunnableObject)) + else if (IsEqualIID(riid, &IID_IRunnableObject) && g_showRunnable) *ppv = runnable; if(*ppv) { @@ -616,7 +619,7 @@ static HRESULT WINAPI OleObjectRunnable_Run( static BOOL WINAPI OleObjectRunnable_IsRunning(IRunnableObject *iface) { CHECK_EXPECTED_METHOD("OleObjectRunnable_IsRunning"); - return TRUE; + return g_isRunning; } static HRESULT WINAPI OleObjectRunnable_LockRunning( @@ -1453,6 +1456,43 @@ static void test_default_handler(void) IOleObject_Release(pObject); } +void test_runnable(void) +{ + static const char *methods_query_runnable[] = + { + "OleObject_QueryInterface", + "OleObjectRunnable_AddRef", + "OleObjectRunnable_IsRunning", + "OleObjectRunnable_Release", + NULL + }; + + static const char *methods_no_runnable[] = + { + "OleObject_QueryInterface", + NULL + }; + + IOleObject *object = (IOleObject *)&OleObject; + + expected_method_list = methods_query_runnable; + ok(OleIsRunning(object), "Object should be running\n"); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + + g_isRunning = FALSE; + expected_method_list = methods_query_runnable; + ok(OleIsRunning(object) == FALSE, "Object should not be running\n"); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + + g_showRunnable = FALSE; /* QueryInterface(IID_IRunnableObject, ...) will fail */ + expected_method_list = methods_no_runnable; + ok(OleIsRunning(object), "Object without IRunnableObject should be running\n"); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + + g_isRunning = TRUE; + g_showRunnable = TRUE; +} + START_TEST(ole2) { DWORD dwRegister; @@ -1483,6 +1523,7 @@ START_TEST(ole2) test_data_cache(); test_default_handler(); + test_runnable(); CoUninitialize(); }

1 0

Francois Gouget : regedit: Add support for 'regedit -' for feeding regedit from stdin.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 09641eeddbe432b20096382570fdb58caa036ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09641eeddbe432b2009638257… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 9 21:04:28 2007 +0200 regedit: Add support for 'regedit -' for feeding regedit from stdin. --- programs/regedit/regedit.c | 47 +++++++++++++++++++++++++++++--------------- 1 files changed, 31 insertions(+), 16 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 155ecfa..ea8aee9 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -138,25 +138,34 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) while(filename[0]) { char* realname = NULL; - int size; - size=SearchPath(NULL,filename,NULL,0,NULL,NULL); - if (size>0) - { - realname=HeapAlloc(GetProcessHeap(),0,size); - size=SearchPath(NULL,filename,NULL,size,realname,NULL); - } - if (size==0) + + if (strcmp(filename, "-") == 0) { - fprintf(stderr,"%s: File not found \"%s\" (%d)\n", - getAppName(),filename,GetLastError()); - exit(1); + reg_file=stdin; } - reg_file = fopen(realname, "r"); - if (reg_file==NULL) + else { - perror(""); - fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), filename); - exit(1); + int size; + + size=SearchPath(NULL, filename, NULL,0, NULL, NULL); + if (size>0) + { + realname=HeapAlloc(GetProcessHeap(), 0, size); + size=SearchPath(NULL, filename, NULL, size, realname, NULL); + } + if (size==0) + { + fprintf(stderr, "%s: File not found \"%s\" (%d)\n", + getAppName(), filename, GetLastError()); + exit(1); + } + reg_file = fopen(realname, "r"); + if (reg_file==NULL) + { + perror(""); + fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), filename); + exit(1); + } } processRegLines(reg_file); if (realname) @@ -240,6 +249,12 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) s++; ch = *s; + if (!ch || isspace(ch)) + { + /* '-' is a file name. It indicates we should use stdin */ + s--; + break; + } ch2 = *(s+1); chu = toupper(ch); if (!ch2 || isspace(ch2)) {

1 0

Francois Gouget : regedit: Add support for 'regedit /E -', to export the registry to stdout.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: ea5d653f3e05969abc426ca640851cf15b3bf1d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5d653f3e05969abc426ca64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 9 21:04:36 2007 +0200 regedit: Add support for 'regedit /E -', to export the registry to stdout. --- programs/regedit/regproc.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 602717a..fb7f37c 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -832,11 +832,18 @@ static void export_hkey(FILE *file, HKEY key, */ static FILE *REGPROC_open_export_file(CHAR *file_name) { - FILE *file = fopen(file_name, "w"); - if (!file) { - perror(""); - fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_name); - exit(1); + FILE *file; + + if (strcmp(file_name,"-")==0) + file=stdout; + else + { + file = fopen(file_name, "w"); + if (!file) { + perror(""); + fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_name); + exit(1); + } } fputs("REGEDIT4\n", file); return file;

1 0

Alexander Nicolaysen Sørnes : Add new voting system
by Chris Morgan 10 Oct '07

10 Oct '07

Module: appdb Branch: master Commit: 835d82e49bee4e1f1d608610698ad29553bdb53f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=835d82e49bee4e1f1d608610… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 9 21:10:29 2007 +0200 Add new voting system --- include/objectManager.php | 14 ++- include/version.php | 4 +- include/vote.php | 183 +++++++++++++++++++++++++++++++++++++++++++++ objectManager.php | 2 +- unit_test/run_tests.php | 2 + unit_test/test_common.php | 13 +++ unit_test/test_voting.php | 72 ++++++++++++++++++ 7 files changed, 283 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=835d82e49bee4e1f1d60…

1 0

Alexandre Julliard : Import of upstream bugzilla release 3.0.2.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: bugzilla Branch: master Commit: 0c0064be157bd5847933334ad2f457d96a8de9fc URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=0c0064be157bd58479333… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 12:11:17 2007 +0200 Import of upstream bugzilla release 3.0.2. --- Bugzilla.pm | 14 + Bugzilla/Attachment.pm | 9 + Bugzilla/Bug.pm | 2 +- Bugzilla/Config/Common.pm | 11 +- Bugzilla/Config/MTA.pm | 6 +- Bugzilla/Config/Query.pm | 10 +- Bugzilla/Constants.pm | 6 +- Bugzilla/DB.pm | 2 +- Bugzilla/DB/Pg.pm | 3 +- Bugzilla/DB/Schema.pm | 32 ++- Bugzilla/Error.pm | 18 ++- Bugzilla/Flag.pm | 10 +- Bugzilla/Install/DB.pm | 2 +- Bugzilla/Install/Filesystem.pm | 21 +- Bugzilla/Mailer.pm | 23 ++- Bugzilla/Search/Quicksearch.pm | 17 +- Bugzilla/Search/Saved.pm | 2 +- Bugzilla/Template.pm | 4 +- Bugzilla/User.pm | 45 +++- Bugzilla/User/Setting/Skin.pm | 4 +- Bugzilla/WebService/Bug.pm | 9 + Bugzilla/WebService/Constants.pm | 3 +- Bugzilla/WebService/User.pm | 5 + QUICKSTART | 12 +- buglist.cgi | 31 ++- chart.cgi | 2 +- collectstats.pl | 22 +- contrib/README | 7 - contrib/bz_webservice_demo.pl | 37 +++- contrib/bzdbcopy.pl | 6 + docs/rel_notes.txt | 34 ++-- docs/xml/Bugzilla-Guide.xml | 6 +- docs/xml/about.xml | 6 +- docs/xml/administration.xml | 9 +- docs/xml/customization.xml | 6 +- docs/xml/dbschema.mysql | 1 - docs/xml/faq.xml | 247 +++++++----------- docs/xml/filetemp.patch | 18 -- docs/xml/glossary.xml | 4 +- docs/xml/introduction.xml | 2 +- docs/xml/patches.xml | 2 +- docs/xml/security.xml | 29 +-- docs/xml/using.xml | 8 +- duplicates.cgi | 8 +- editcomponents.cgi | 2 +- editparams.cgi | 4 +- editproducts.cgi | 11 +- email_in.pl | 13 +- process_bug.cgi | 101 +++++--- sanitycheck.cgi | 10 +- showdependencygraph.cgi | 8 +- skins/standard/global.css | 4 + t/009bugwords.t | 4 +- .../en/default/account/auth/login-small.html.tmpl | 3 + template/en/default/account/auth/login.html.tmpl | 4 + template/en/default/account/prefs/email.html.tmpl | 10 + .../default/account/prefs/saved-searches.html.tmpl | 45 +++- .../en/default/account/prefs/settings.html.tmpl | 2 +- .../default/admin/classifications/edit.html.tmpl | 2 +- .../en/default/admin/components/edit.html.tmpl | 6 +- .../default/admin/custom_fields/create.html.tmpl | 2 +- .../en/default/admin/custom_fields/edit.html.tmpl | 2 +- .../en/default/admin/custom_fields/list.html.tmpl | 4 +- template/en/default/admin/keywords/list.html.tmpl | 2 +- template/en/default/admin/params/core.html.tmpl | 3 +- template/en/default/admin/params/mta.html.tmpl | 5 + template/en/default/admin/params/query.html.tmpl | 5 +- .../en/default/admin/settings/updated.html.tmpl | 2 +- .../default/admin/users/confirm-delete.html.tmpl | 2 +- template/en/default/admin/users/userdata.html.tmpl | 6 +- .../en/default/bug/create/create-guided.html.tmpl | 2 +- template/en/default/bug/edit.html.tmpl | 14 +- .../bug/process/verify-new-product.html.tmpl | 44 +++- template/en/default/bug/summarize-time.html.tmpl | 4 +- .../en/default/bug/votes/list-for-user.html.tmpl | 2 +- template/en/default/email/newchangedmail.txt.tmpl | 2 +- template/en/default/email/sudo.txt.tmpl | 2 +- template/en/default/filterexceptions.pl | 1 - template/en/default/flag/list.html.tmpl | 9 +- template/en/default/global/code-error.html.tmpl | 26 ++- template/en/default/global/header.html.tmpl | 2 +- template/en/default/global/messages.html.tmpl | 12 +- template/en/default/global/setting-descs.none.tmpl | 4 +- template/en/default/global/useful-links.html.tmpl | 2 +- template/en/default/global/user-error.html.tmpl | 54 +++-- template/en/default/index.html.tmpl | 4 +- template/en/default/list/list.csv.tmpl | 6 +- template/en/default/list/table.html.tmpl | 6 +- template/en/default/pages/bug-writing.html.tmpl | 273 ++++---------------- template/en/default/pages/release-notes.html.tmpl | 129 +++++++++- template/en/default/reports/chart.png.tmpl | 2 +- .../en/default/reports/report-simple.html.tmpl | 2 +- template/en/default/reports/report-table.html.tmpl | 13 +- template/en/default/request/email.txt.tmpl | 10 +- template/en/default/search/knob.html.tmpl | 2 +- template/en/default/search/search-help.html.tmpl | 2 +- .../default/search/search-report-graph.html.tmpl | 2 +- .../en/default/search/search-specific.html.tmpl | 9 +- template/en/default/sidebar.xul.tmpl | 2 +- template/en/default/whine/schedule.html.tmpl | 2 +- userprefs.cgi | 21 +- votes.cgi | 7 +- whineatnews.pl | 9 +- 103 files changed, 951 insertions(+), 747 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=0c0064be157bd5847…

1 0

Alexandre Julliard : Merge branch 'upstream'
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: bugzilla Branch: master Commit: f6342ddaee404cc4b485ec6a43168a72e05813f5 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=f6342ddaee404cc4b485e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 12:11:57 2007 +0200 Merge branch 'upstream' ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 3.0.2.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: bugzilla Branch: upstream Commit: 0c0064be157bd5847933334ad2f457d96a8de9fc URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=0c0064be157bd58479333… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 12:11:17 2007 +0200 Import of upstream bugzilla release 3.0.2. --- Bugzilla.pm | 14 + Bugzilla/Attachment.pm | 9 + Bugzilla/Bug.pm | 2 +- Bugzilla/Config/Common.pm | 11 +- Bugzilla/Config/MTA.pm | 6 +- Bugzilla/Config/Query.pm | 10 +- Bugzilla/Constants.pm | 6 +- Bugzilla/DB.pm | 2 +- Bugzilla/DB/Pg.pm | 3 +- Bugzilla/DB/Schema.pm | 32 ++- Bugzilla/Error.pm | 18 ++- Bugzilla/Flag.pm | 10 +- Bugzilla/Install/DB.pm | 2 +- Bugzilla/Install/Filesystem.pm | 21 +- Bugzilla/Mailer.pm | 23 ++- Bugzilla/Search/Quicksearch.pm | 17 +- Bugzilla/Search/Saved.pm | 2 +- Bugzilla/Template.pm | 4 +- Bugzilla/User.pm | 45 +++- Bugzilla/User/Setting/Skin.pm | 4 +- Bugzilla/WebService/Bug.pm | 9 + Bugzilla/WebService/Constants.pm | 3 +- Bugzilla/WebService/User.pm | 5 + QUICKSTART | 12 +- buglist.cgi | 31 ++- chart.cgi | 2 +- collectstats.pl | 22 +- contrib/README | 7 - contrib/bz_webservice_demo.pl | 37 +++- contrib/bzdbcopy.pl | 6 + docs/rel_notes.txt | 34 ++-- docs/xml/Bugzilla-Guide.xml | 6 +- docs/xml/about.xml | 6 +- docs/xml/administration.xml | 9 +- docs/xml/customization.xml | 6 +- docs/xml/dbschema.mysql | 1 - docs/xml/faq.xml | 247 +++++++----------- docs/xml/filetemp.patch | 18 -- docs/xml/glossary.xml | 4 +- docs/xml/introduction.xml | 2 +- docs/xml/patches.xml | 2 +- docs/xml/security.xml | 29 +-- docs/xml/using.xml | 8 +- duplicates.cgi | 8 +- editcomponents.cgi | 2 +- editparams.cgi | 4 +- editproducts.cgi | 11 +- email_in.pl | 13 +- process_bug.cgi | 101 +++++--- sanitycheck.cgi | 10 +- showdependencygraph.cgi | 8 +- skins/standard/global.css | 4 + t/009bugwords.t | 4 +- .../en/default/account/auth/login-small.html.tmpl | 3 + template/en/default/account/auth/login.html.tmpl | 4 + template/en/default/account/prefs/email.html.tmpl | 10 + .../default/account/prefs/saved-searches.html.tmpl | 45 +++- .../en/default/account/prefs/settings.html.tmpl | 2 +- .../default/admin/classifications/edit.html.tmpl | 2 +- .../en/default/admin/components/edit.html.tmpl | 6 +- .../default/admin/custom_fields/create.html.tmpl | 2 +- .../en/default/admin/custom_fields/edit.html.tmpl | 2 +- .../en/default/admin/custom_fields/list.html.tmpl | 4 +- template/en/default/admin/keywords/list.html.tmpl | 2 +- template/en/default/admin/params/core.html.tmpl | 3 +- template/en/default/admin/params/mta.html.tmpl | 5 + template/en/default/admin/params/query.html.tmpl | 5 +- .../en/default/admin/settings/updated.html.tmpl | 2 +- .../default/admin/users/confirm-delete.html.tmpl | 2 +- template/en/default/admin/users/userdata.html.tmpl | 6 +- .../en/default/bug/create/create-guided.html.tmpl | 2 +- template/en/default/bug/edit.html.tmpl | 14 +- .../bug/process/verify-new-product.html.tmpl | 44 +++- template/en/default/bug/summarize-time.html.tmpl | 4 +- .../en/default/bug/votes/list-for-user.html.tmpl | 2 +- template/en/default/email/newchangedmail.txt.tmpl | 2 +- template/en/default/email/sudo.txt.tmpl | 2 +- template/en/default/filterexceptions.pl | 1 - template/en/default/flag/list.html.tmpl | 9 +- template/en/default/global/code-error.html.tmpl | 26 ++- template/en/default/global/header.html.tmpl | 2 +- template/en/default/global/messages.html.tmpl | 12 +- template/en/default/global/setting-descs.none.tmpl | 4 +- template/en/default/global/useful-links.html.tmpl | 2 +- template/en/default/global/user-error.html.tmpl | 54 +++-- template/en/default/index.html.tmpl | 4 +- template/en/default/list/list.csv.tmpl | 6 +- template/en/default/list/table.html.tmpl | 6 +- template/en/default/pages/bug-writing.html.tmpl | 273 ++++---------------- template/en/default/pages/release-notes.html.tmpl | 129 +++++++++- template/en/default/reports/chart.png.tmpl | 2 +- .../en/default/reports/report-simple.html.tmpl | 2 +- template/en/default/reports/report-table.html.tmpl | 13 +- template/en/default/request/email.txt.tmpl | 10 +- template/en/default/search/knob.html.tmpl | 2 +- template/en/default/search/search-help.html.tmpl | 2 +- .../default/search/search-report-graph.html.tmpl | 2 +- .../en/default/search/search-specific.html.tmpl | 9 +- template/en/default/sidebar.xul.tmpl | 2 +- template/en/default/whine/schedule.html.tmpl | 2 +- userprefs.cgi | 21 +- votes.cgi | 7 +- whineatnews.pl | 9 +- 103 files changed, 951 insertions(+), 747 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=0c0064be157bd5847…

1 0

Juan Lang : wintrust: Add generic chain action to known actions.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 0cd5f2089e9cd00756468a5b13049256168f2a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd5f2089e9cd00756468a5b1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 8 15:58:10 2007 -0700 wintrust: Add generic chain action to known actions. --- dlls/wintrust/wintrust_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index faf837c..cb6724f 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -332,6 +332,7 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) static const GUID published_software = WIN_SPUB_ACTION_PUBLISHED_SOFTWARE; static const GUID generic_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; static const GUID generic_cert_verify = WINTRUST_ACTION_GENERIC_CERT_VERIFY; + static const GUID generic_chain_verify = WINTRUST_ACTION_GENERIC_CHAIN_VERIFY; LONG err = ERROR_SUCCESS; WINTRUST_DATA *actionData = (WINTRUST_DATA *)ActionData; @@ -346,7 +347,8 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) /* Check known actions to warn of possible problems */ if (!IsEqualGUID(ActionID, &unknown) && !IsEqualGUID(ActionID, &generic_verify_v2) && - !IsEqualGUID(ActionID, &generic_cert_verify)) + !IsEqualGUID(ActionID, &generic_cert_verify) && + !IsEqualGUID(ActionID, &generic_chain_verify)) WARN("unknown action %s, default behavior may not be right\n", debugstr_guid(ActionID)); switch (actionData->dwStateAction)

1 0

Juan Lang : wintrust: Implement GenericChainCertificateTrust.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: d1fcdea034168bfb25dd595638a1c50114edba3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fcdea034168bfb25dd59563… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 8 15:40:22 2007 -0700 wintrust: Implement GenericChainCertificateTrust. --- dlls/wintrust/softpub.c | 52 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index bbbd227..5770244 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -660,6 +660,58 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) return ret ? S_OK : S_FALSE; } +HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) +{ + BOOL ret; + WTD_GENERIC_CHAIN_POLICY_DATA *policyData = + (WTD_GENERIC_CHAIN_POLICY_DATA *)data->pWintrustData->pPolicyCallbackData; + + TRACE("(%p)\n", data); + + if (policyData && policyData->u.cbSize != + sizeof(WTD_GENERIC_CHAIN_POLICY_CREATE_INFO)) + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + goto end; + } + if (!data->csSigners) + { + ret = FALSE; + SetLastError(TRUST_E_NOSIGNATURE); + } + else + { + DWORD i; + WTD_GENERIC_CHAIN_POLICY_CREATE_INFO createInfo, *pCreateInfo; + CERT_CHAIN_PARA chainPara, *pChainPara; + + if (policyData) + { + pCreateInfo = policyData->pSignerChainInfo; + pChainPara = pCreateInfo->pChainPara; + } + else + { + WINTRUST_CreateChainPolicyCreateInfo(data, &createInfo, &chainPara); + pChainPara = &chainPara; + pCreateInfo = &createInfo; + } + ret = TRUE; + for (i = 0; i < data->csSigners; i++) + ret = WINTRUST_CreateChainForSigner(data, i, pCreateInfo, + pChainPara); + } + +end: + if (!ret) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = + GetLastError(); + TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); + return ret ? S_OK : S_FALSE; +} + HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data) { BOOL ret; diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index bcac267..a5ee3d0 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -46,7 +46,7 @@ @ stub DriverFinalPolicy @ stub DriverInitializePolicy @ stub FindCertsByIssuer -@ stub GenericChainCertificateTrust +@ stdcall GenericChainCertificateTrust(ptr) @ stub GenericChainFinalProv @ stub HTTPSCertificateTrust @ stub HTTPSFinalProv

1 0