wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Greg Geldorp : shlwapi/tests: Don't assume date/time are separated by comma .
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: f64a800fd9fbd0a820191779f4c0c1bfd80ed678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64a800fd9fbd0a820191779f… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 14 12:32:45 2011 +0100 shlwapi/tests: Don't assume date/time are separated by comma. --- dlls/shlwapi/tests/ordinal.c | 78 ++++++++++++++++++++++++++++++------------ 1 files changed, 56 insertions(+), 22 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8f13407..0125ce4 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1732,24 +1732,30 @@ if (0) flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d, length %d\n", ret, lstrlenA(buff)+1); - ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); - ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - strcat(buff2, ", "); ret = GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - strcat(buff2, buff3); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, + "expected (%s), got (%s) for time part\n", + buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); + ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); + ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); + buff[lstrlenA(buff2)] = '\0'; + ok(lstrcmpA(buff2, buff) == 0, "expected (%s) got (%s) for date part\n", + buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); - ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); - ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); - strcat(buff2, ", "); ret = GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, buff3, sizeof(buff3)); ok(ret == lstrlenA(buff3)+1, "got %d\n", ret); - strcat(buff2, buff3); - ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); + ok(lstrcmpA(buff3, buff + lstrlenA(buff) - lstrlenA(buff3)) == 0, + "expected (%s), got (%s) for time part\n", + buff3, buff + lstrlenA(buff) - lstrlenA(buff3)); + ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); + ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); + buff[lstrlenA(buff2)] = '\0'; + ok(lstrcmpA(buff2, buff) == 0, "expected (%s) got (%s) for date part\n", + buff2, buff); flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); @@ -1777,12 +1783,12 @@ if (0) static void test_SHFormatDateTimeW(void) { FILETIME UNALIGNED filetime; - WCHAR buff[100], buff2[100], buff3[100]; + WCHAR buff[100], buff2[100], buff3[100], *p1, *p2; SYSTEMTIME st; DWORD flags; INT ret; static const WCHAR spaceW[] = {' ',0}; - static const WCHAR commaW[] = {',',' ',0}; +#define UNICODE_LTR_MARK 0x200e if(!pSHFormatDateTimeW) { @@ -1901,25 +1907,53 @@ if (0) ret = pSHFormatDateTimeW(&filetime, &flags, buff, sizeof(buff)/sizeof(WCHAR)); ok(ret == lstrlenW(buff)+1 || ret == lstrlenW(buff), "expected %d or %d, got %d\n", lstrlenW(buff)+1, lstrlenW(buff), ret); - ret = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)/sizeof(WCHAR)); - ok(ret == lstrlenW(buff2)+1, "expected %d, got %d\n", lstrlenW(buff2)+1, ret); - lstrcatW(buff2, commaW); ret = GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, buff3, sizeof(buff3)/sizeof(WCHAR)); ok(ret == lstrlenW(buff3)+1, "expected %d, got %d\n", lstrlenW(buff3)+1, ret); - lstrcatW(buff2, buff3); - ok(lstrcmpW(buff, buff2) == 0, "expected equal strings\n"); + ok(lstrcmpW(buff3, buff + lstrlenW(buff) - lstrlenW(buff3)) == 0, + "expected (%s), got (%s) for time part\n", + wine_dbgstr_w(buff3), wine_dbgstr_w(buff + lstrlenW(buff) - lstrlenW(buff3))); + ret = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)/sizeof(WCHAR)); + ok(ret == lstrlenW(buff2)+1, "expected %d, got %d\n", lstrlenW(buff2)+1, ret); + p1 = buff; + p2 = buff2; + while (*p2 != '\0') + { + while (*p1 == UNICODE_LTR_MARK) + p1++; + while (*p2 == UNICODE_LTR_MARK) + p2++; + p1++; + p2++; + } + *p1 = '\0'; + ok(lstrcmpW(buff2, buff) == 0, "expected (%s) got (%s) for date part\n", + wine_dbgstr_w(buff2), wine_dbgstr_w(buff)); flags = FDTF_LONGDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeW(&filetime, &flags, buff, sizeof(buff)/sizeof(WCHAR)); ok(ret == lstrlenW(buff)+1 || ret == lstrlenW(buff), "expected %d or %d, got %d\n", lstrlenW(buff)+1, lstrlenW(buff), ret); - ret = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)/sizeof(WCHAR)); - ok(ret == lstrlenW(buff2)+1, "expected %d, got %d\n", lstrlenW(buff2)+1, ret); - lstrcatW(buff2, commaW); ret = GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, buff3, sizeof(buff3)/sizeof(WCHAR)); ok(ret == lstrlenW(buff3)+1, "expected %d, got %d\n", lstrlenW(buff3)+1, ret); - lstrcatW(buff2, buff3); - ok(lstrcmpW(buff, buff2) == 0, "expected equal strings\n"); + ok(lstrcmpW(buff3, buff + lstrlenW(buff) - lstrlenW(buff3)) == 0, + "expected (%s), got (%s) for time part\n", + wine_dbgstr_w(buff3), wine_dbgstr_w(buff + lstrlenW(buff) - lstrlenW(buff3))); + ret = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)/sizeof(WCHAR)); + ok(ret == lstrlenW(buff2)+1, "expected %d, got %d\n", lstrlenW(buff2)+1, ret); + p1 = buff; + p2 = buff2; + while (*p2 != '\0') + { + while (*p1 == UNICODE_LTR_MARK) + p1++; + while (*p2 == UNICODE_LTR_MARK) + p2++; + p1++; + p2++; + } + *p1 = '\0'; + ok(lstrcmpW(buff2, buff) == 0, "expected (%s) got (%s) for date part\n", + wine_dbgstr_w(buff2), wine_dbgstr_w(buff)); flags = FDTF_SHORTDATE | FDTF_SHORTTIME; ret = pSHFormatDateTimeW(&filetime, &flags, buff, sizeof(buff)/sizeof(WCHAR));

1 0

Greg Geldorp : gdi32/tests: Fix tmLastChar test.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 16e917198904941c8a5b7a0e1bd5b516c1623094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e917198904941c8a5b7a0e1… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 14 12:27:56 2011 +0100 gdi32/tests: Fix tmLastChar test. --- dlls/gdi32/tests/font.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a8c28f4..14639da 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -37,6 +37,7 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) static LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); +static DWORD (WINAPI *pGdiGetCodePage)(HDC hdc); static BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsA)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); @@ -55,6 +56,7 @@ static void init(void) hgdi32 = GetModuleHandleA("gdi32.dll"); pGdiGetCharDimensions = (void *)GetProcAddress(hgdi32, "GdiGetCharDimensions"); + pGdiGetCodePage = (void *) GetProcAddress(hgdi32,"GdiGetCodePage"); pGetCharABCWidthsI = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsI"); pGetCharABCWidthsA = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsA"); pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); @@ -1618,7 +1620,6 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count INT cs; DWORD i, ret; char name[64]; - DWORD (WINAPI *pGdiGetCodePage)(HDC); assert(count <= 128); @@ -1660,8 +1661,6 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count } ok(csi.ciACP == code_page, "expected %d, got %d\n", code_page, csi.ciACP); - pGdiGetCodePage = (void *) GetProcAddress(GetModuleHandleA("gdi32.dll"), - "GdiGetCodePage"); if (pGdiGetCodePage != NULL && pGdiGetCodePage(hdc) != code_page) { skip("Font code page %d, looking for code page %d\n", @@ -2558,9 +2557,12 @@ static void test_text_metrics(const LOGFONTA *lf) ok(tmA.tmFirstChar == expect_first_A || tmA.tmFirstChar == expect_first_A + 1 /* win9x */, "A: tmFirstChar for %s got %02x expected %02x\n", font_name, tmA.tmFirstChar, expect_first_A); - ok(tmA.tmLastChar == expect_last_A || - tmA.tmLastChar == 0xff /* win9x */, - "A: tmLastChar for %s got %02x expected %02x\n", font_name, tmA.tmLastChar, expect_last_A); + if (pGdiGetCodePage == NULL || ! IsDBCSLeadByteEx(pGdiGetCodePage(hdc), tmA.tmLastChar)) + ok(tmA.tmLastChar == expect_last_A || + tmA.tmLastChar == 0xff /* win9x */, + "A: tmLastChar for %s got %02x expected %02x\n", font_name, tmA.tmLastChar, expect_last_A); + else + skip("tmLastChar is DBCS lead byte\n"); ok(tmA.tmBreakChar == expect_break_A, "A: tmBreakChar for %s got %02x expected %02x\n", font_name, tmA.tmBreakChar, expect_break_A); ok(tmA.tmDefaultChar == expect_default_A || broken(sys_lang_non_english),

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in ProtocolProxy.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 5d6b2f13de10f2779741b38377f493bbd677e7b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6b2f13de10f2779741b3837… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 14 11:35:02 2011 +0100 urlmon: Use ifaces instead of vtbl pointers in ProtocolProxy. --- dlls/urlmon/bindprot.c | 8 ++-- dlls/urlmon/protproxy.c | 72 +++++++++++++++++++++++---------------------- dlls/urlmon/urlmon_main.h | 5 +-- 3 files changed, 43 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d6b2f13de10f2779741b…

1 0

Michael Stefaniuc : objsel: COM cleanup for the IDsObjectPicker iface.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: f0bd3e694b60f662a473aeda4788415c1d6241f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bd3e694b60f662a473aeda4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 14 00:46:40 2011 +0100 objsel: COM cleanup for the IDsObjectPicker iface. --- dlls/objsel/objsel.c | 15 ++++++++++----- dlls/objsel/objsel_private.h | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 3ba2ac1..f258e1d 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -99,12 +99,17 @@ static VOID OBJSEL_IDsObjectPicker_Destroy(IDsObjectPickerImpl *This) } +static inline IDsObjectPickerImpl *impl_from_IDsObjectPicker(IDsObjectPicker *iface) +{ + return CONTAINING_RECORD(iface, IDsObjectPickerImpl, IDsObjectPicker_iface); +} + /********************************************************************** * OBJSEL_IDsObjectPicker_AddRef (also IUnknown) */ static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) { - IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface; + IDsObjectPickerImpl *This = impl_from_IDsObjectPicker(iface); ULONG ref; TRACE("\n"); @@ -127,7 +132,7 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) */ static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface) { - IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface; + IDsObjectPickerImpl *This = impl_from_IDsObjectPicker(iface); ULONG ref; TRACE("\n"); @@ -219,9 +224,9 @@ HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) sizeof(IDsObjectPickerImpl)); if (Instance != NULL) { - Instance->lpVtbl = &IDsObjectPicker_Vtbl; - OBJSEL_IDsObjectPicker_AddRef((IDsObjectPicker *)Instance); - + Instance->IDsObjectPicker_iface.lpVtbl = &IDsObjectPicker_Vtbl; + OBJSEL_IDsObjectPicker_AddRef(&Instance->IDsObjectPicker_iface); + *ppvObj = Instance; return S_OK; } diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h index 62d6eb4..13ab577 100644 --- a/dlls/objsel/objsel_private.h +++ b/dlls/objsel/objsel_private.h @@ -55,7 +55,7 @@ typedef struct typedef struct { - IDsObjectPickerVtbl *lpVtbl; + IDsObjectPicker IDsObjectPicker_iface; LONG ref; } IDsObjectPickerImpl;

1 0

Michael Stefaniuc : objsel: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 39e80379e797805f2ff7f333dfc31d8f5a4f1cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e80379e797805f2ff7f333d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 14 00:42:42 2011 +0100 objsel: COM cleanup for the IClassFactory iface. --- dlls/objsel/factory.c | 11 ++++++++--- dlls/objsel/objsel.c | 2 +- dlls/objsel/objsel_private.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/objsel/factory.c b/dlls/objsel/factory.c index 090c126..cb0fb49 100644 --- a/dlls/objsel/factory.c +++ b/dlls/objsel/factory.c @@ -26,6 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(objsel); +static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface); +} + /********************************************************************** * OBJSEL_IClassFactory_QueryInterface (also IUnknown) */ @@ -60,7 +65,7 @@ static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface( */ static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface) { - ClassFactoryImpl *This = (ClassFactoryImpl *)iface; + ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref; TRACE("\n"); @@ -83,7 +88,7 @@ static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface) */ static ULONG WINAPI OBJSEL_IClassFactory_Release(LPCLASSFACTORY iface) { - ClassFactoryImpl *This = (ClassFactoryImpl *)iface; + ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref; TRACE("\n"); @@ -160,4 +165,4 @@ static IClassFactoryVtbl IClassFactory_Vtbl = * static ClassFactory instance */ -ClassFactoryImpl OBJSEL_ClassFactory = { &IClassFactory_Vtbl, 0 }; +ClassFactoryImpl OBJSEL_ClassFactory = { { &IClassFactory_Vtbl }, 0 }; diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 7993320..3ba2ac1 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -54,7 +54,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) *ppv = NULL; if (IsEqualGUID(rclsid, &CLSID_DsObjectPicker)) - return IClassFactory_QueryInterface((IClassFactory*)&OBJSEL_ClassFactory, iid, ppv); + return IClassFactory_QueryInterface(&OBJSEL_ClassFactory.IClassFactory_iface, iid, ppv); FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h index 8c9a3c8..62d6eb4 100644 --- a/dlls/objsel/objsel_private.h +++ b/dlls/objsel/objsel_private.h @@ -49,7 +49,7 @@ extern LONG dll_refs; */ typedef struct { - IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; LONG ref; } ClassFactoryImpl;

1 0

Michael Stefaniuc : sxs: COM cleanup for the IAssemblyCache iface.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 1c35951f9fa07bc058fbd025cd0b5c2373ccc33d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c35951f9fa07bc058fbd025c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 14 00:39:39 2011 +0100 sxs: COM cleanup for the IAssemblyCache iface. --- dlls/sxs/cache.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 8f9238d..af19e60 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -45,16 +45,21 @@ static inline WCHAR *strdupW( const WCHAR *s ) struct cache { - const IAssemblyCacheVtbl *vtbl; + IAssemblyCache IAssemblyCache_iface; LONG refs; }; +static inline struct cache *impl_from_IAssemblyCache(IAssemblyCache *iface) +{ + return CONTAINING_RECORD(iface, struct cache, IAssemblyCache_iface); +} + static HRESULT WINAPI cache_QueryInterface( IAssemblyCache *iface, REFIID riid, void **obj ) { - struct cache *cache = (struct cache *)iface; + struct cache *cache = impl_from_IAssemblyCache(iface); TRACE("%p, %s, %p\n", cache, debugstr_guid(riid), obj); @@ -73,13 +78,13 @@ static HRESULT WINAPI cache_QueryInterface( static ULONG WINAPI cache_AddRef( IAssemblyCache *iface ) { - struct cache *cache = (struct cache *)iface; + struct cache *cache = impl_from_IAssemblyCache(iface); return InterlockedIncrement( &cache->refs ); } static ULONG WINAPI cache_Release( IAssemblyCache *iface ) { - struct cache *cache = (struct cache *)iface; + struct cache *cache = impl_from_IAssemblyCache(iface); ULONG refs = InterlockedDecrement( &cache->refs ); if (!refs) @@ -605,9 +610,9 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) if (!cache) return E_OUTOFMEMORY; - cache->vtbl = &cache_vtbl; + cache->IAssemblyCache_iface.lpVtbl = &cache_vtbl; cache->refs = 1; - *obj = (IAssemblyCache *)cache; + *obj = &cache->IAssemblyCache_iface; return S_OK; }

1 0

Juan Lang : rsaenh: Add support for CRYPT_IPSEC_HMAC_KEY.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: c91afb9733b2227935c0bafaab3f1ef0fcd75dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91afb9733b2227935c0bafaa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 13 15:08:48 2011 -0800 rsaenh: Add support for CRYPT_IPSEC_HMAC_KEY. --- dlls/advapi32/tests/crypt.c | 4 -- dlls/rsaenh/rsaenh.c | 93 ++++++++++++++++++++++++++++++++++++------- dlls/rsaenh/tests/rsaenh.c | 3 +- 3 files changed, 79 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 99f113d..2ffc62e 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -993,7 +993,6 @@ static void test_rc2_keylen(void) sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ - todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); @@ -1041,7 +1040,6 @@ static void test_rc2_keylen(void) sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ - todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); @@ -1066,7 +1064,6 @@ static void test_rc2_keylen(void) ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); - todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); @@ -1081,7 +1078,6 @@ static void test_rc2_keylen(void) ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); - todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0f9959d..50954c5 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -74,7 +74,7 @@ typedef struct tagCRYPTHASH * CRYPTKEY - key objects */ #define RSAENH_MAGIC_KEY 0x73620457u -#define RSAENH_MAX_KEY_SIZE 48 +#define RSAENH_MAX_KEY_SIZE 64 #define RSAENH_MAX_BLOCK_SIZE 24 #define RSAENH_KEYSTATE_IDLE 0 #define RSAENH_KEYSTATE_ENCRYPTING 1 @@ -105,6 +105,7 @@ typedef struct tagCRYPTKEY BYTE abInitVector[RSAENH_MAX_BLOCK_SIZE]; BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE]; RSAENH_SCHANNEL_INFO siSChannelInfo; + CRYPT_DATA_BLOB blobHmacKey; } CRYPTKEY; /****************************************************************************** @@ -732,6 +733,7 @@ static void destroy_key(OBJECTHDR *pObject) free_key_impl(pCryptKey->aiAlgid, &pCryptKey->context); free_data_blob(&pCryptKey->siSChannelInfo.blobClientRandom); free_data_blob(&pCryptKey->siSChannelInfo.blobServerRandom); + free_data_blob(&pCryptKey->blobHmacKey); HeapFree(GetProcessHeap(), 0, pCryptKey); } @@ -825,7 +827,13 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK return (HCRYPTKEY)INVALID_HANDLE_VALUE; } break; - + + case CALG_HMAC: + /* Avoid the key length check for HMAC keys, which have unlimited + * length. + */ + break; + default: if (dwKeyLen % 8 || dwKeyLen > peaAlgidInfo->dwMaxLen || @@ -859,6 +867,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK memset(pCryptKey->abInitVector, 0, sizeof(pCryptKey->abInitVector)); init_data_blob(&pCryptKey->siSChannelInfo.blobClientRandom); init_data_blob(&pCryptKey->siSChannelInfo.blobServerRandom); + init_data_blob(&pCryptKey->blobHmacKey); switch(aiAlgid) { @@ -892,6 +901,11 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK pCryptKey->dwBlockLen = dwKeyLen >> 3; pCryptKey->dwMode = 0; break; + + case CALG_HMAC: + pCryptKey->dwBlockLen = 0; + pCryptKey->dwMode = 0; + break; } *ppCryptKey = pCryptKey; @@ -2931,25 +2945,53 @@ static BOOL import_plaintext_key(HCRYPTPROV hProv, CONST BYTE *pbData, CONST DWORD *pKeyLen = (CONST DWORD *)(pBlobHeader + 1); CONST BYTE *pbKeyStream = (CONST BYTE*)(pKeyLen + 1); - if (dwFlags & CRYPT_IPSEC_HMAC_KEY) - { - FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); - SetLastError(NTE_BAD_FLAGS); - return FALSE; - } if (dwDataLen < sizeof(BLOBHEADER)+sizeof(DWORD)+*pKeyLen) { SetLastError(NTE_BAD_DATA); /* FIXME: error code */ return FALSE; } - *phKey = new_key(hProv, pBlobHeader->aiKeyAlg, *pKeyLen<<19, &pCryptKey); - if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) - return FALSE; - memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); - setup_key(pCryptKey); - if (dwFlags & CRYPT_EXPORTABLE) - pCryptKey->dwPermissions |= CRYPT_EXPORT; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + *phKey = new_key(hProv, CALG_HMAC, 0, &pCryptKey); + if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) + return FALSE; + if (*pKeyLen <= sizeof(pCryptKey->abKeyValue)) + { + memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); + pCryptKey->dwKeyLen = *pKeyLen; + } + else + { + CRYPT_DATA_BLOB blobHmacKey = { *pKeyLen, (BYTE *)pbKeyStream }; + + /* In order to initialize an HMAC key, the key material is hashed, + * and the output of the hash function is used as the key material. + * Unfortunately, the way the Crypto API is designed, we don't know + * the hash algorithm yet, so we have to copy the entire key + * material. + */ + if (!copy_data_blob(&pCryptKey->blobHmacKey, &blobHmacKey)) + { + release_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY); + *phKey = (HCRYPTKEY)INVALID_HANDLE_VALUE; + return FALSE; + } + } + setup_key(pCryptKey); + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; + } + else + { + *phKey = new_key(hProv, pBlobHeader->aiKeyAlg, *pKeyLen<<19, &pCryptKey); + if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) + return FALSE; + memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); + setup_key(pCryptKey); + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; + } return TRUE; } @@ -4172,6 +4214,27 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa return FALSE; } + if (pCryptKey->aiAlgid == CALG_HMAC && !pCryptKey->dwKeyLen) { + HCRYPTHASH hKeyHash; + + if (!RSAENH_CPCreateHash(hProv, ((PHMAC_INFO)pbData)->HashAlgid, 0, 0, + &hKeyHash)) + return FALSE; + if (!RSAENH_CPHashData(hProv, hKeyHash, pCryptKey->blobHmacKey.pbData, + pCryptKey->blobHmacKey.cbData, 0)) + { + RSAENH_CPDestroyHash(hProv, hKeyHash); + return FALSE; + } + pCryptKey->dwKeyLen = sizeof(pCryptKey->abKeyValue); + if (!RSAENH_CPGetHashParam(hProv, hKeyHash, HP_HASHVAL, pCryptKey->abKeyValue, + &pCryptKey->dwKeyLen, 0)) + { + RSAENH_CPDestroyHash(hProv, hKeyHash); + return FALSE; + } + RSAENH_CPDestroyHash(hProv, hKeyHash); + } for (i=0; i<RSAENH_MIN(pCryptKey->dwKeyLen,pCryptHash->pHMACInfo->cbInnerString); i++) { pCryptHash->pHMACInfo->pbInnerString[i] ^= pCryptKey->abKeyValue[i]; } diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 844747c..dd69c1d 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2235,7 +2235,6 @@ static void test_import_hmac(void) *key_len = test_case->key_len; memcpy(key_bytes, test_case->key, *key_len); result = CryptImportKey(hProv, blob, size, 0, CRYPT_IPSEC_HMAC_KEY, &key); - todo_wine ok(result || broken(GetLastError() == NTE_BAD_FLAGS /* Win2k */), "CryptImportKey failed on test case %d: %08x\n", i, GetLastError()); if (result) { @@ -2253,7 +2252,7 @@ static void test_import_hmac(void) digest_size = sizeof(digest); result = CryptGetHashParam(hash, HP_HASHVAL, digest, &digest_size, 0); ok(result, "CryptGetHashParam failed on test case %d: %08x\n", i, GetLastError()); - ok(!memcmp(digest, test_case->digest, sizeof(digest)), "Unexpected valued on test case %d\n", i); + ok(!memcmp(digest, test_case->digest, sizeof(digest)), "Unexpected value on test case %d\n", i); CryptDestroyHash(hash); CryptDestroyKey(key); }

1 0

Juan Lang : rsaenh: Move check for CRYPT_IPSEC_HMAC_KEY to each key import function.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 5ccf2bd9982bc7b7cb8e8ce93e3b48fb24b63a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccf2bd9982bc7b7cb8e8ce93… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 13 09:10:47 2011 -0800 rsaenh: Move check for CRYPT_IPSEC_HMAC_KEY to each key import function. --- dlls/rsaenh/rsaenh.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 46a0920..0f9959d 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2694,6 +2694,12 @@ static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat CONST RSAPUBKEY *pRSAPubKey = (CONST RSAPUBKEY*)(pBlobHeader+1); BOOL ret; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { @@ -2770,6 +2776,12 @@ static BOOL import_public_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwData ALG_ID algID; BOOL ret; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { @@ -2844,6 +2856,12 @@ static BOOL import_symmetric_key(HCRYPTPROV hProv, CONST BYTE *pbData, BYTE *pbDecrypted; DWORD dwKeyLen; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hPubKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pPubKey) || pPubKey->aiAlgid != CALG_RSA_KEYX) { @@ -2913,6 +2931,12 @@ static BOOL import_plaintext_key(HCRYPTPROV hProv, CONST BYTE *pbData, CONST DWORD *pKeyLen = (CONST DWORD *)(pBlobHeader + 1); CONST BYTE *pbKeyStream = (CONST BYTE*)(pKeyLen + 1); + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (dwDataLen < sizeof(BLOBHEADER)+sizeof(DWORD)+*pKeyLen) { SetLastError(NTE_BAD_DATA); /* FIXME: error code */ @@ -3026,12 +3050,6 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); - if (dwFlags & CRYPT_IPSEC_HMAC_KEY) - { - FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); - SetLastError(NTE_BAD_FLAGS); - return FALSE; - } return import_key(hProv, pbData, dwDataLen, hPubKey, dwFlags, TRUE, phKey); }

1 0

Alexandre Julliard : mshtml: Remove a leftover string table.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 61cf2d35ae97576597aaa2dd9c39a27ba5ef952a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cf2d35ae97576597aaa2dd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 12:57:41 2011 +0100 mshtml: Remove a leftover string table. --- dlls/mshtml/Sr.rc | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/Sr.rc b/dlls/mshtml/Sr.rc index 2c7efd1..87148e6 100644 --- a/dlls/mshtml/Sr.rc +++ b/dlls/mshtml/Sr.rc @@ -50,18 +50,6 @@ FONT 8, "MS Shell Dlg" LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN -STRINGTABLE -{ - IDS_STATUS_DONE "Završeno" - IDS_STATUS_DOWNLOADINGFROM "Preuzimanje iz %s..." -} - -STRINGTABLE -{ - IDS_HTMLDISABLED "HTML iscrtavanje je onemogućeno." - IDS_HTMLDOCUMENT "HTML dokument" -} - IDD_HYPERLINK DIALOG 0, 0, 250, 65 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hiperveza"

1 0

Alexandre Julliard : wrc: Remove the context prefix when generating the po file for English.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 36bc86bfb3d40d68ffcb23a31ae6586a32cb9465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bc86bfb3d40d68ffcb23a31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 12:49:41 2011 +0100 wrc: Remove the context prefix when generating the po file for English. --- tools/wrc/po.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index e47bda2..d7aabc5 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -301,6 +301,11 @@ static void po_xerror2( int severity, po_message_t message1, static const struct po_xerror_handler po_xerror_handler = { po_xerror, po_xerror2 }; +static int is_english( const language_t *lan ) +{ + return lan->id == LANG_ENGLISH && lan->sub == SUBLANG_DEFAULT; +} + static char *convert_string_utf8( const string_t *str, int codepage ) { string_t *newstr = convert_string( str, str_unicode, codepage ); @@ -371,7 +376,7 @@ static void add_po_string( po_file_t po, const string_t *msgid, const string_t * po_message_t msg; po_message_iterator_t iterator; int codepage; - char *id, *id_buffer, *context, *str_buffer = NULL; + char *id, *id_buffer, *context, *str = NULL, *str_buffer = NULL; if (!msgid->size) return; @@ -383,13 +388,14 @@ static void add_po_string( po_file_t po, const string_t *msgid, const string_t * if (lang) codepage = get_language_codepage( lang->id, lang->sub ); else codepage = get_language_codepage( 0, 0 ); assert( codepage != -1 ); - str_buffer = convert_string_utf8( msgstr, codepage ); + str_buffer = str = convert_string_utf8( msgstr, codepage ); + if (is_english( lang )) get_message_context( &str ); } if (!(msg = find_message( po, id, context, &iterator ))) { msg = po_message_create(); po_message_set_msgid( msg, id ); - po_message_set_msgstr( msg, str_buffer ? str_buffer : "" ); + po_message_set_msgstr( msg, str ? str : "" ); if (context) po_message_set_msgctxt( msg, context ); po_message_insert( iterator, msg ); } @@ -631,11 +637,6 @@ static void add_po_menu( const resource_t *english, const resource_t *res ) add_po_menu_items( po, english_items, items, res->res.men->lvc.language ); } -static int is_english( const language_t *lan ) -{ - return lan->id == LANG_ENGLISH && lan->sub == SUBLANG_DEFAULT; -} - static resource_t *find_english_resource( resource_t *res ) { resource_t *ptr;

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
88
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 January 2011