February 2011 - Wine-commits

Juan Lang : crypt32: Fix return value in error cases (clang).
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: bcd14a1822e29c40b972a38df6a36ec2b6ea6779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd14a1822e29c40b972a38df… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:12:41 2011 -0800 crypt32: Fix return value in error cases (clang). --- dlls/crypt32/chain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7c10b3..ca76cef 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3213,7 +3213,8 @@ static BOOL match_domain_component(LPCWSTR allowed_component, DWORD allowed_len, break; } } - matches = tolowerW(*allowed_ptr) == tolowerW(*server_ptr); + if (matches) + matches = tolowerW(*allowed_ptr) == tolowerW(*server_ptr); } if (matches && server_ptr - server_component < server_len) {

1 0

Juan Lang : crypt32: Don't assume a function succeeded (clang).
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: b377f83453cf82d5274aeebc233702e72a100a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b377f83453cf82d5274aeebc2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:16:25 2011 -0800 crypt32: Don't assume a function succeeded (clang). --- dlls/crypt32/msg.c | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 97860e5..50c1bee 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1559,38 +1559,42 @@ static BOOL WINAPI CRYPT_ExportKeyTrans( X509_ASN_ENCODING, &keyInfo, &expKey); if (ret) { - BYTE *keyBlob; DWORD size; ret = CryptExportKey(pContentEncryptInfo->hContentEncryptKey, expKey, SIMPLEBLOB, 0, NULL, &size); - keyBlob = CryptMemAlloc(size); - if (keyBlob) + if (ret) { - ret = CryptExportKey(pContentEncryptInfo->hContentEncryptKey, - expKey, SIMPLEBLOB, 0, keyBlob, &size); - if (ret) - { - DWORD head = sizeof(BLOBHEADER) + sizeof(ALG_ID); + BYTE *keyBlob; - pKeyTransEncryptInfo->EncryptedKey.pbData = - CryptMemAlloc(size - head); - if (pKeyTransEncryptInfo->EncryptedKey.pbData) + keyBlob = CryptMemAlloc(size); + if (keyBlob) + { + ret = CryptExportKey(pContentEncryptInfo->hContentEncryptKey, + expKey, SIMPLEBLOB, 0, keyBlob, &size); + if (ret) { - DWORD i, k = 0; + DWORD head = sizeof(BLOBHEADER) + sizeof(ALG_ID); + + pKeyTransEncryptInfo->EncryptedKey.pbData = + CryptMemAlloc(size - head); + if (pKeyTransEncryptInfo->EncryptedKey.pbData) + { + DWORD i, k = 0; - pKeyTransEncryptInfo->EncryptedKey.cbData = size - head; - for (i = size - 1; i >= head; --i, ++k) - pKeyTransEncryptInfo->EncryptedKey.pbData[k] = - keyBlob[i]; + pKeyTransEncryptInfo->EncryptedKey.cbData = size - head; + for (i = size - 1; i >= head; --i, ++k) + pKeyTransEncryptInfo->EncryptedKey.pbData[k] = + keyBlob[i]; + } + else + ret = FALSE; } - else - ret = FALSE; + CryptMemFree(keyBlob); } - CryptMemFree(keyBlob); + else + ret = FALSE; } - else - ret = FALSE; CryptDestroyKey(expKey); }

1 0

Juan Lang : crypt32: Don' t assign a count value unless memory allocation succeeds (clang).
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 3cdd20f91de873f806621f0f2163c7c2ce7c4f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cdd20f91de873f806621f0f2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:31:16 2011 -0800 crypt32: Don't assign a count value unless memory allocation succeeds (clang). --- dlls/crypt32/encode.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 825eb44..6b61337 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1330,13 +1330,15 @@ static BOOL CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, const CERT_RDN *rdn, ret = TRUE; if (rdn->cRDNAttr) { - setOf.cBlob = rdn->cRDNAttr; setOf.rgBlob = CryptMemAlloc(rdn->cRDNAttr * sizeof(CRYPT_DER_BLOB)); if (!setOf.rgBlob) ret = FALSE; else + { + setOf.cBlob = rdn->cRDNAttr; memset(setOf.rgBlob, 0, setOf.cBlob * sizeof(CRYPT_DER_BLOB)); + } } for (i = 0; ret && i < rdn->cRDNAttr; i++) {

1 0

Thomas Mullaly : mshtml: Fixed a few typos.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 5624ece30df5cdb42922b5dd6eb4e507415a4504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5624ece30df5cdb42922b5dd6… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Feb 15 20:22:58 2011 -0500 mshtml: Fixed a few typos. --- dlls/mshtml/persist.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index d10b353..43d7e3c 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -203,9 +203,9 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &offline); if(SUCCEEDED(hres)) { - if(V_VT(&silent) != VT_BOOL) - WARN("V_VT(offline) = %d\n", V_VT(&silent)); - else if(V_BOOL(&silent)) + if(V_VT(&offline) != VT_BOOL) + WARN("V_VT(offline) = %d\n", V_VT(&offline)); + else if(V_BOOL(&offline)) FIXME("offline == true\n"); } }

1 0

Jacek Caban : msxml3: Silence QueryInterface FIXME.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: e703763e51c9190c2fe7c324e0847238f41d9857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e703763e51c9190c2fe7c324e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 11:26:57 2011 +0100 msxml3: Silence QueryInterface FIXME. --- dlls/msxml3/httprequest.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 4dd4de8..0be4fbb 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -505,7 +505,8 @@ static HRESULT WINAPI httprequest_QueryInterface(IXMLHTTPRequest *iface, REFIID } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Gerald Pfeifer : wpp: Add explicit casts when mixing signed and unsigned integers.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 7a3226be4696a01ddf4f9fe8494224455a6c9a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3226be4696a01ddf4f9fe84… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Feb 16 02:50:46 2011 +0100 wpp: Add explicit casts when mixing signed and unsigned integers. --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5f1566e..b50e120 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -59,7 +59,7 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.si = v1.val.si OP v2.val.si; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.si = v1.val.si OP v2.val.ui; \ + r.val.si = v1.val.si OP (signed) v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ r.val.si = v1.val.ui OP v2.val.si; \ else \ @@ -70,7 +70,7 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.sl = v1.val.sl OP v2.val.sl; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.sl = v1.val.sl OP v2.val.ul; \ + r.val.sl = v1.val.sl OP (signed long) v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ r.val.sl = v1.val.ul OP v2.val.sl; \ else \ @@ -81,7 +81,7 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.sll = v1.val.sll OP v2.val.sll; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.sll = v1.val.sll OP v2.val.ull; \ + r.val.sll = v1.val.sll OP (wrc_sll_t) v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ r.val.sll = v1.val.ull OP v2.val.sll; \ else \

1 0

Alexandre Julliard : cabinet: Rewrite the cabinet header output code, and write everything to disk in one step.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: afae86aa1ef376d27f4e94cfad8eb20e80b6593a URL: http://source.winehq.org/git/wine.git/?a=commit;h=afae86aa1ef376d27f4e94cfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 20:08:44 2011 +0100 cabinet: Rewrite the cabinet header output code, and write everything to disk in one step. --- dlls/cabinet/fci.c | 305 +++++++++++++++++++--------------------------------- 1 files changed, 111 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afae86aa1ef376d27f4e9…

1 0

Alexandre Julliard : cabinet: Store the data block headers in a memory list instead of on-disk.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: ea22b17065d61b1cd04b8848279b9ba9f0ec7c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea22b17065d61b1cd04b88482… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 00:20:49 2011 +0100 cabinet: Store the data block headers in a memory list instead of on-disk. Compute the checksums only when writing to the final file. --- dlls/cabinet/fci.c | 393 ++++++++++++++++++++++++++-------------------------- 1 files changed, 195 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea22b17065d61b1cd04b8…

1 0

Alexandre Julliard : msvcr90/tests: Fix the type info test for 64-bit.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: de8dc80c85306e152284bd36c000480831ab4ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8dc80c85306e152284bd36c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 13:59:18 2011 +0100 msvcr90/tests: Fix the type info test for 64-bit. --- dlls/msvcr90/tests/msvcr90.c | 48 ++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index ace9e35..3ae76f1 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -87,7 +87,14 @@ typedef struct __type_info char mangled[16]; } type_info; -static char* (WINAPI *p_type_info_name_internal_method)(type_info*); + +struct __type_info_node +{ + void *memPtr; + struct __type_info_node* next; +}; + +static char* (WINAPI *p_type_info_name_internal_method)(type_info*, struct __type_info_node *); static void (WINAPI *ptype_info_dtor)(type_info*); static void* (WINAPI *pEncodePointer)(void *); @@ -104,6 +111,7 @@ static inline int almost_equal_f(float f1, float f2) /* thiscall emulation */ /* Emulate a __thiscall */ +#ifdef __i386__ #ifdef _MSC_VER static inline void* do_call_func1(void *func, void *_this) { @@ -155,8 +163,15 @@ static void* do_call_func2(void *func, void *_this, const void* arg) } #endif -#define call_func1(x,y) do_call_func1((void*)x,(void*)y) -#define call_func2(x,y,z) do_call_func2((void*)x,(void*)y,(void*)z) +#define call_func1(func,_this) do_call_func1(func,_this) +#define call_func2(func,_this,a) do_call_func2(func,_this,(const void*)a) + +#else + +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -863,13 +878,6 @@ if (0) p_free(mem); } -#ifdef __i386__ - -struct __type_info_node { - void *memPtr; - struct __type_info_node* next; -}; - static void test_typeinfo(void) { static type_info t1 = { NULL, NULL,{'.','?','A','V','t','e','s','t','1','@','@',0,0,0,0,0 } }; @@ -894,11 +902,6 @@ static void test_typeinfo(void) ok(t1.name && !strcmp(t1.name, "class test1"), "demangled to '%s' for t1\n", t1.name); call_func1(ptype_info_dtor, &t1); } -#else -static void test_typeinfo(void) -{ -} -#endif START_TEST(msvcr90) { @@ -938,9 +941,18 @@ START_TEST(msvcr90) p_realloc_crt = (void*) GetProcAddress(hcrt, "_realloc_crt"); p_malloc = (void*) GetProcAddress(hcrt, "malloc"); p_free = (void*)GetProcAddress(hcrt, "free"); - p_type_info_name_internal_method = (void*)GetProcAddress(hcrt, - "?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z"); - ptype_info_dtor = (void*)GetProcAddress(hcrt, "??1type_info@@UAE(a)XZ"); + if (sizeof(void *) == 8) + { + p_type_info_name_internal_method = (void*)GetProcAddress(hcrt, + "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); + ptype_info_dtor = (void*)GetProcAddress(hcrt, "??1type_info@@UEAA(a)XZ"); + } + else + { + p_type_info_name_internal_method = (void*)GetProcAddress(hcrt, + "?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z"); + ptype_info_dtor = (void*)GetProcAddress(hcrt, "??1type_info@@UAE(a)XZ"); + } hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer");

1 0

Amine Khaldi : riched20: Fix a c89 conformance issue in ITextImpl->editor-> rcFormat initialization.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: f8da57ca89d47509f14a18eae3c3a49e05d0a97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8da57ca89d47509f14a18eae… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Tue Feb 15 18:44:03 2011 +0100 riched20: Fix a c89 conformance issue in ITextImpl->editor->rcFormat initialization. --- dlls/riched20/txtsrv.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index b4625ad..674bf38 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -88,7 +88,11 @@ HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, ITextImpl->lpVtbl = &textservices_Vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat = (RECT){0,0,0,0}; + ITextImpl->editor->rcFormat.left = 0; + ITextImpl->editor->rcFormat.top = 0; + ITextImpl->editor->rcFormat.right = 0; + ITextImpl->editor->rcFormat.bottom = 0; + ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter)

1 0