October 2009 - Wine-Commits

Jacek Caban : mshtml: Use DISPATCH_* macros instead of INVOKE_*.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: d43ab58efb1a27dbbe1511c4d9d5a039aa4b9ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43ab58efb1a27dbbe1511c4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:50:02 2009 +0200 mshtml: Use DISPATCH_* macros instead of INVOKE_*. --- dlls/mshtml/dispex.c | 9 +++++---- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 210c3ae..4079242 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -221,7 +221,7 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN data->funcs[data->func_cnt].id = desc->memid; data->funcs[data->func_cnt].tid = tid; - data->funcs[data->func_cnt].func_disp_idx = desc->invkind == INVOKE_FUNC ? data->func_disp_cnt++ : -1; + data->funcs[data->func_cnt].func_disp_idx = desc->invkind == DISPATCH_METHOD ? data->func_disp_cnt++ : -1; data->func_cnt++; } @@ -572,6 +572,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, switch(flags) { case DISPATCH_METHOD: + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: hres = typeinfo_invoke(This, func, flags, dp, res, ei); break; case DISPATCH_PROPERTYGET: { @@ -809,7 +810,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc var = &This->dynamic_data->props[idx].var; switch(wFlags) { - case INVOKE_FUNC: { + case DISPATCH_METHOD: { DISPID named_arg = DISPID_THIS; DISPPARAMS dp = {NULL, &named_arg, 0, 1}; IDispatchEx *dispex; @@ -848,9 +849,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc heap_free(dp.rgvarg); return hres; } - case INVOKE_PROPERTYGET: + case DISPATCH_PROPERTYGET: return VariantCopy(pvarRes, var); - case INVOKE_PROPERTYPUT: + case DISPATCH_PROPERTYPUT: VariantClear(var); return VariantCopy(var, pdp->rgvarg); default: diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 743cc06..70827bc 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -397,7 +397,7 @@ static HRESULT HTMLElementCollection_invoke(IUnknown *iface, DISPID id, LCID lci return DISP_E_UNKNOWNNAME; switch(flags) { - case INVOKE_PROPERTYGET: + case DISPATCH_PROPERTYGET: V_VT(res) = VT_DISPATCH; V_DISPATCH(res) = (IDispatch*)HTMLELEM(This->elems[idx]); IHTMLElement_AddRef(HTMLELEM(This->elems[idx])); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 1c7b7cb..9227899 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -208,7 +208,7 @@ static HRESULT HTMLDOMChildrenCollection_invoke(IUnknown *iface, DISPID id, LCID TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); switch(flags) { - case INVOKE_PROPERTYGET: { + case DISPATCH_PROPERTYGET: { IDispatch *disp = NULL; HRESULT hres;

1 0

Jacek Caban : mshtml: Return failure in GetContentType if content type is not available.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 1d134f74ab8aa4c83d40594b2c2ce3852d3f2649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d134f74ab8aa4c83d40594b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:50:55 2009 +0200 mshtml: Return failure in GetContentType if content type is not available. --- dlls/mshtml/nsio.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f10db48..6c0217f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -502,9 +502,8 @@ static nsresult NSAPI nsChannel_GetContentType(nsIHttpChannel *iface, nsACString if(This->channel) return nsIChannel_GetContentType(This->channel, aContentType); - TRACE("returning default text/html\n"); - nsACString_SetData(aContentType, "text/html"); - return NS_OK; + WARN("unknown type\n"); + return NS_ERROR_FAILURE; } static nsresult NSAPI nsChannel_SetContentType(nsIHttpChannel *iface,

1 0

Matteo Bruni : wpp: Add I/O callbacks.
by Alexandre Julliard Oct. 13, 2009

Oct. 13, 2009

Module: wine Branch: master Commit: e773c516baaf49b9aca0280be5a5bf3af3cca8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e773c516baaf49b9aca0280be… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 30 20:15:38 2009 +0200 wpp: Add I/O callbacks. --- include/wine/wpp.h | 17 +++++ libs/wpp/ppl.l | 70 +++++++++++++++++-- libs/wpp/ppy.y | 14 ++-- libs/wpp/preproc.c | 182 ++++++++++++++++++++++++++++-------------------- libs/wpp/wpp.c | 8 +- libs/wpp/wpp_private.h | 4 +- 6 files changed, 199 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e773c516baaf49b9aca02…

1 0

Paul Vriens : advapi32/tests: Add some extra tests.
by Alexandre Julliard Oct. 13, 2009

Oct. 13, 2009

Module: wine Branch: master Commit: 17c1881953070a587676dff10b6f4240eeb0cb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c1881953070a587676dff10… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 15:40:20 2009 +0200 advapi32/tests: Add some extra tests. --- dlls/advapi32/tests/security.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b1f5664..a60136e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2673,6 +2673,18 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_PARAMETER }, + /* test ACE string type with spaces */ + { " D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D: (D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:( D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D ;;GA;;;WD)", SDDL_REVISION_1, FALSE, RPC_S_INVALID_STRING_UUID }, + { "D:(D; ;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;; GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA ;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, + { "D:(D;;GA; ;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;; ;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;;; WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;;;WD )", SDDL_REVISION_1, TRUE }, /* test ACE string access rights */ { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE },

1 0

Paul Vriens : advapi32/tests: Make some tests table driven.
by Alexandre Julliard Oct. 13, 2009

Oct. 13, 2009

Module: wine Branch: master Commit: 69568dac914cbde0209a95d2336f2de57119633c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69568dac914cbde0209a95d23… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 13:34:34 2009 +0200 advapi32/tests: Make some tests table driven. --- dlls/advapi32/tests/security.c | 129 +++++++++++++-------------------------- 1 files changed, 43 insertions(+), 86 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1a2e39d..b1f5664 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2659,6 +2659,36 @@ static void test_ConvertStringSecurityDescriptor(void) BOOL ret; PSECURITY_DESCRIPTOR pSD; static const WCHAR Blank[] = { 0 }; + int i; + static const struct + { + const char *sidstring; + DWORD revision; + BOOL ret; + DWORD GLE; + } cssd[] = + { + { "D:(A;;GA;;;WD)", 0xdeadbeef, FALSE, ERROR_UNKNOWN_REVISION }, + /* test ACE string type */ + { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(D;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_PARAMETER }, + /* test ACE string access rights */ + { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + /* test ACE string access right error case */ + { "D:(A;;ROB;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, + /* test behaviour with empty strings */ + { "", SDDL_REVISION_1, TRUE }, + /* test ACE string SID */ + { "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, TRUE } + }; if (!pConvertStringSecurityDescriptorToSecurityDescriptorA) { @@ -2666,82 +2696,20 @@ static void test_ConvertStringSecurityDescriptor(void) return; } - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;GA;;;WD)", 0xdeadbeef, &pSD, NULL); - ok(!ret && GetLastError() == ERROR_UNKNOWN_REVISION, - "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_UNKNOWN_REVISION instead of %d\n", - GetLastError()); - - /* test ACE string type */ - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(D;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_PARAMETER instead of %d\n", - GetLastError()); - - /* test ACE string access rights */ - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); + for (i = 0; i < sizeof(cssd)/sizeof(cssd[0]); i++) + { + DWORD GLE; - /* test ACE string access right error case */ - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(A;;ROB;;;WD)", SDDL_REVISION_1, &pSD, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_ACL, - "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_ACL instead of %d\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + cssd[i].sidstring, cssd[i].revision, &pSD, NULL); + GLE = GetLastError(); + ok(ret == cssd[i].ret, "(%02d) Expected %s (%d)\n", i, cssd[i].ret ? "success" : "failure", GLE); + if (!cssd[i].ret) + ok(GLE == cssd[i].GLE, "(%02d) Expected %d, got %d\n", i, cssd[i].GLE, GLE); + if (ret) + LocalFree(pSD); + } /* test behaviour with NULL parameters */ SetLastError(0xdeadbeef); @@ -2775,11 +2743,6 @@ static void test_ConvertStringSecurityDescriptor(void) /* test behaviour with empty strings */ SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - - SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorW( Blank, SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); @@ -2787,12 +2750,6 @@ static void test_ConvertStringSecurityDescriptor(void) /* test ACE string SID */ SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( - "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, &pSD, NULL); - ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - LocalFree(pSD); - - SetLastError(0xdeadbeef); - ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, &pSD, NULL); ok(!ret, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_ACL || GetLastError() == ERROR_INVALID_SID,

1 0

Aric Stewart : wininet: Cache basic authentication values based on realm and host.
by Alexandre Julliard Oct. 13, 2009

Oct. 13, 2009

Module: wine Branch: master Commit: fc5089349de7ec440a31a12cc1bf4199e76f4650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5089349de7ec440a31a12cc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 12 14:24:18 2009 -0500 wininet: Cache basic authentication values based on realm and host. --- dlls/wininet/http.c | 221 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 177 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc5089349de7ec440a31a…

1 0

Alexandre Julliard : winetest: Improve the native dll check to catch . NET dlls too.
by Alexandre Julliard Oct. 13, 2009

Oct. 13, 2009

Module: wine Branch: master Commit: 33d91a861a989a138403c4cbde25a7c91fcb5cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d91a861a989a138403c4cbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 13 14:51:39 2009 +0200 winetest: Improve the native dll check to catch .NET dlls too. --- programs/winetest/main.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index bab7f11..2c9a57d 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -158,18 +158,20 @@ static int running_on_visible_desktop (void) return IsWindowVisible(desktop); } -/* check for wine fake dll module */ -static BOOL is_fake_dll( HMODULE module ) +/* check for native dll when running under wine */ +static BOOL is_native_dll( HMODULE module ) { static const char fakedll_signature[] = "Wine placeholder DLL"; const IMAGE_DOS_HEADER *dos; + if (!running_under_wine()) return FALSE; if (!((ULONG_PTR)module & 1)) return FALSE; /* not loaded as datafile */ + /* builtin dlls can't be loaded as datafile, so we must have native or fake dll */ dos = (const IMAGE_DOS_HEADER *)((const char *)module - 1); if (dos->e_magic != IMAGE_DOS_SIGNATURE) return FALSE; if (dos->e_lfanew >= sizeof(*dos) + sizeof(fakedll_signature) && - !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return TRUE; - return FALSE; + !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return FALSE; + return TRUE; } /* check if Gecko is present, trying to trigger the install if not */ @@ -656,24 +658,16 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, if (!dll) dll = load_com_dll(dllname, &wine_tests[nr_of_files].maindllpath, filename); - if (dll && running_under_wine() && ((ULONG_PTR)dll & 1)) - { - /* builtin dlls can't be loaded as datafile, so we must have native or fake dll */ - if (!is_fake_dll(dll)) - { - FreeLibrary(dll); - xprintf (" %s=load error Configured as native\n", dllname); - return TRUE; - } - } - if (!dll && pLoadLibraryShim) { MultiByteToWideChar(CP_ACP, 0, dllname, -1, dllnameW, MAX_PATH); - if (FAILED( pLoadLibraryShim(dllnameW, NULL, NULL, &dll) )) - dll = 0; - else + if (SUCCEEDED( pLoadLibraryShim(dllnameW, NULL, NULL, &dll) ) && dll) + { get_dll_path(dll, &wine_tests[nr_of_files].maindllpath, filename); + FreeLibrary(dll); + dll = LoadLibraryExA(filename, NULL, LOAD_LIBRARY_AS_DATAFILE); + } + else dll = 0; } if (!dll) @@ -681,6 +675,12 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, xprintf (" %s=dll is missing\n", dllname); return TRUE; } + if (is_native_dll(dll)) + { + FreeLibrary(dll); + xprintf (" %s=load error Configured as native\n", dllname); + return TRUE; + } if (!strcmp( dllname, "mshtml" ) && running_under_wine() && !gecko_check()) { FreeLibrary(dll);

1 0

Paul Vriens : advapi32: Skip leading spaces when parsing.
by Alexandre Julliard Oct. 13, 2009

Oct. 13, 2009

Module: wine Branch: master Commit: e57edfea8bf0cd79ca0b7b3d42f5cceb97ab3439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57edfea8bf0cd79ca0b7b3d4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 15:39:47 2009 +0200 advapi32: Skip leading spaces when parsing. --- dlls/advapi32/security.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 24c48c8..f89c12f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3876,6 +3876,9 @@ static BYTE ParseAceStringType(LPCWSTR* StringAcl) LPCWSTR szAcl = *StringAcl; const ACEFLAG *lpaf = AceType; + while (*szAcl == ' ') + szAcl++; + while (lpaf->wstr && (len = strlenW(lpaf->wstr)) && strncmpW(lpaf->wstr, szAcl, len)) @@ -3884,7 +3887,7 @@ static BYTE ParseAceStringType(LPCWSTR* StringAcl) if (!lpaf->wstr) return 0; - *StringAcl += len; + *StringAcl = szAcl + len; return lpaf->value; } @@ -3910,6 +3913,9 @@ static BYTE ParseAceStringFlags(LPCWSTR* StringAcl) BYTE flags = 0; LPCWSTR szAcl = *StringAcl; + while (*szAcl == ' ') + szAcl++; + while (*szAcl != ';') { const ACEFLAG *lpaf = AceFlags; @@ -3974,6 +3980,9 @@ static DWORD ParseAceStringRights(LPCWSTR* StringAcl) DWORD rights = 0; LPCWSTR szAcl = *StringAcl; + while (*szAcl == ' ') + szAcl++; + if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) { LPCWSTR p = szAcl; @@ -4029,6 +4038,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, DWORD acesize = 0; DWORD acecount = 0; PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ + DWORD error = ERROR_INVALID_ACL; TRACE("%s\n", debugstr_w(StringAcl)); @@ -4051,7 +4061,10 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, if (pAce) pAce->Header.AceType = (BYTE) val; if (*StringAcl != ';') + { + error = RPC_S_INVALID_STRING_UUID; goto lerr; + } StringAcl++; /* Parse ACE flags */ @@ -4071,6 +4084,8 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, StringAcl++; /* Parse ACE object guid */ + while (*StringAcl == ' ') + StringAcl++; if (*StringAcl != ';') { FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); @@ -4079,6 +4094,8 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, StringAcl++; /* Parse ACE inherit object guid */ + while (*StringAcl == ' ') + StringAcl++; if (*StringAcl != ';') { FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); @@ -4126,7 +4143,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, return TRUE; lerr: - SetLastError(ERROR_INVALID_ACL); + SetLastError(error); WARN("Invalid ACE string format\n"); return FALSE; } @@ -4152,6 +4169,9 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( if (SecurityDescriptor) lpNext = (LPBYTE)(SecurityDescriptor + 1); + while (*StringSecurityDescriptor == ' ') + StringSecurityDescriptor++; + while (*StringSecurityDescriptor) { toktype = *StringSecurityDescriptor; @@ -5045,6 +5065,9 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) return FALSE; } + while (*StringSid == ' ') + StringSid++; + *cBytes = ComputeStringSidSize(StringSid); if (!pisid) /* Simply compute the size */ {

1 0

Alexandre Julliard : ntdll: Use the exception code as exit status when no debugger is present.
by Alexandre Julliard Oct. 13, 2009

Oct. 13, 2009

Module: wine Branch: master Commit: 44ed5c0423d6ae425c319435571b56a1327762df URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ed5c0423d6ae425c3194355… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 13 14:15:27 2009 +0200 ntdll: Use the exception code as exit status when no debugger is present. --- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_sparc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e426388..9be32a6 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -697,7 +697,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f else WINE_ERR("Unhandled exception code %x flags %x addr %p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - NtTerminateProcess( NtCurrentProcess(), 1 ); + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); } return STATUS_SUCCESS; } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index ccd64f9..67bee92 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -674,7 +674,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f else ERR("Unhandled exception code %x flags %x addr %p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - NtTerminateProcess( NtCurrentProcess(), 1 ); + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); } return STATUS_SUCCESS; } diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index a38d34e..afde5f8 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -225,7 +225,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f else ERR("Unhandled exception code %x flags %x addr %p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - NtTerminateProcess( NtCurrentProcess(), 1 ); + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); } return STATUS_SUCCESS; }

1 0

Dmitry Timoshkov : rsaenh: Fix the accepted RC2 key length, based on a test case by Dan Kegel.
by Alexandre Julliard Oct. 13, 2009

Oct. 13, 2009

Module: wine Branch: master Commit: d3c482250a8232e9657ecefb3e61fff0194e3fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c482250a8232e9657ecefb3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 13 19:25:31 2009 +0900 rsaenh: Fix the accepted RC2 key length, based on a test case by Dan Kegel. --- dlls/advapi32/tests/crypt.c | 49 ++++++++++++++++++++++++++++++++++++++++-- dlls/rsaenh/rsaenh.c | 2 +- include/wincrypt.h | 3 ++ 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 4ce8907..08c53f0 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -933,17 +933,60 @@ static void test_machine_guid(void) RegCloseKey(key); } +#define key_length 16 + +static const unsigned char key[key_length] = + { 0xbf, 0xf6, 0x83, 0x4b, 0x3e, 0xa3, 0x23, 0xdd, + 0x96, 0x78, 0x70, 0x8e, 0xa1, 0x9d, 0x3b, 0x40 }; + +static void hashtest(void) +{ + struct KeyBlob + { + BLOBHEADER header; + DWORD key_size; + BYTE key_data[key_length]; + } key_blob; + + HCRYPTPROV provider; + HCRYPTKEY hkey; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&provider, NULL, NULL, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %u\n", GetLastError()); + + key_blob.header.bType = PLAINTEXTKEYBLOB; + key_blob.header.bVersion = CUR_BLOB_VERSION; + key_blob.header.reserved = 0; + key_blob.header.aiKeyAlg = CALG_RC2; + key_blob.key_size = key_length; + memcpy(key_blob.key_data, key, key_length); + + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_length, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + ok(ret, "CryptImportKey error %u\n", GetLastError()); + + pCryptDestroyKey(hkey); + pCryptReleaseContext(provider, 0); +} + START_TEST(crypt) { - init_function_pointers(); - if(pCryptAcquireContextA && pCryptReleaseContext) { + init_function_pointers(); + if (pCryptAcquireContextA && pCryptReleaseContext) + { + hashtest(); init_environment(); test_acquire_context(); test_incorrect_api_usage(); test_verify_sig(); test_machine_guid(); clean_up_environment(); - } + } test_enum_providers(); test_enum_provider_types(); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 8ae9659..04048cf 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -159,7 +159,7 @@ typedef struct tagKEYCONTAINER static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = { { - {CALG_RC2, 40, 40, 56,0, 4,"RC2", 24,"RSA Data Security's RC2"}, + {CALG_RC2, 40, 5, 128,0, 4,"RC2", 24,"RSA Data Security's RC2"}, {CALG_RC4, 40, 40, 56,0, 4,"RC4", 24,"RSA Data Security's RC4"}, {CALG_DES, 56, 56, 56,0, 4,"DES", 31,"Data Encryption Standard (DES)"}, {CALG_SHA, 160,160, 160,CRYPT_FLAG_SIGNING, 6,"SHA-1", 30,"Secure Hash Algorithm (SHA-1)"}, diff --git a/include/wincrypt.h b/include/wincrypt.h index 0aef72e..56a0155 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -80,6 +80,9 @@ typedef struct _SCHANNEL_ALG { DWORD dwReserved; } SCHANNEL_ALG, *PSCHANNEL_ALG; + +#define CRYPT_IPSEC_HMAC_KEY 0x0100 + typedef struct _HMAC_INFO { ALG_ID HashAlgid; BYTE* pbInnerString;

1 0