August 2008 - Wine-devel - list.winehq.org

Re: crypt32(4/7): Add tests for CMSG_CMS_SIGNER_INFO_PARAM
by Eric Pouech 20 Aug '08

20 Aug '08

Juan Lang a écrit : > --Juan > ------------------------------------------------------------------------ > > From 7eaf8a741cc4ff2035491f36ba9b8f7c5d650458 Mon Sep 17 00:00:00 2001 > From: Juan Lang <juan.lang(a)gmail.com> > Date: Mon, 18 Aug 2008 13:09:24 -0700 > Subject: [PATCH] Add tests for CMSG_CMS_SIGNER_INFO_PARAM > > --- > dlls/crypt32/tests/msg.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 135 insertions(+), 0 deletions(-) > > diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c > index 86ce6b1..ce4affd 100644 > --- a/dlls/crypt32/tests/msg.c > +++ b/dlls/crypt32/tests/msg.c > @@ -2265,9 +2265,56 @@ static void compare_signer_info(const CMSG_SIGNER_INFO *got, > /* FIXME: check more things */ > } > > +static void compare_cms_signer_info(const CMSG_CMS_SIGNER_INFO *got, > + const CMSG_CMS_SIGNER_INFO *expected) > +{ > + ok(got->dwVersion == expected->dwVersion, "Expected version %d, got %d\n", > + expected->dwVersion, got->dwVersion); > + ok(got->SignerId.dwIdChoice == expected->SignerId.dwIdChoice, > + "Expected id choice %d, got %d\n", expected->SignerId.dwIdChoice, > + got->SignerId.dwIdChoice); > + if (got->SignerId.dwIdChoice == expected->SignerId.dwIdChoice) > + { > + if (got->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) > + { > + ok(got->SignerId.IssuerSerialNumber.Issuer.cbData == > + expected->SignerId.IssuerSerialNumber.Issuer.cbData, > + "Expected issuer size %d, got %d\n", > + expected->SignerId.IssuerSerialNumber.Issuer.cbData, > + got->SignerId.IssuerSerialNumber.Issuer.cbData); > + ok(!memcmp(got->SignerId.IssuerSerialNumber.Issuer.pbData, > + got->SignerId.IssuerSerialNumber.Issuer.pbData, shouldn't it be expected->SignerId.IssuerSerialNumber.Issuer.pbData, > + got->SignerId.IssuerSerialNumber.Issuer.cbData), > + "Unexpected issuer\n"); > + ok(got->SignerId.IssuerSerialNumber.SerialNumber.cbData == > + expected->SignerId.IssuerSerialNumber.SerialNumber.cbData, > + "Expected serial number size %d, got %d\n", > + expected->SignerId.IssuerSerialNumber.SerialNumber.cbData, > + got->SignerId.IssuerSerialNumber.SerialNumber.cbData); > + ok(!memcmp(got->SignerId.IssuerSerialNumber.SerialNumber.pbData, > + got->SignerId.IssuerSerialNumber.SerialNumber.pbData, ditto ? > + got->SignerId.IssuerSerialNumber.SerialNumber.cbData), > + "Unexpected serial number\n"); > + } > + else > + { > + ok(got->SignerId.KeyId.cbData == expected->SignerId.KeyId.cbData, > + "expected key id size %d, got %d\n", > + expected->SignerId.KeyId.cbData, got->SignerId.KeyId.cbData); > + ok(!memcmp(expected->SignerId.KeyId.pbData, > + got->SignerId.KeyId.pbData, got->SignerId.KeyId.cbData), > + "unexpected key id\n"); > + } > + } > + /* FIXME: check more things */ > +} > + > static const BYTE signedWithCertAndCrlComputedHash[] = { > 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26, > 0x2f }; > +static BYTE keyIdIssuer[] = { > +0x30,0x13,0x31,0x11,0x30,0x0f,0x06,0x0a,0x2b,0x06,0x01,0x04,0x01,0x82,0x37, > +0x0a,0x07,0x01,0x04,0x01,0x01 }; > > static void test_decode_msg_get_param(void) > { > @@ -2354,6 +2401,32 @@ static void test_decode_msg_get_param(void) > compare_signer_info((CMSG_SIGNER_INFO *)buf, &signer); > CryptMemFree(buf); > } > + /* Getting the CMS signer info of a PKCS7 message is possible. */ > + size = 0; > + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); > + todo_wine > + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); > + if (ret) > + buf = CryptMemAlloc(size); > + else > + buf = NULL; > + if (buf) > + { > + CMSG_CMS_SIGNER_INFO signer = { 0 }; > + > + signer.dwVersion = 1; > + signer.SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; > + signer.SignerId.IssuerSerialNumber.Issuer.cbData = > + sizeof(encodedCommonName); > + signer.SignerId.IssuerSerialNumber.Issuer.pbData = encodedCommonName; > + signer.SignerId.IssuerSerialNumber.SerialNumber.cbData = > + sizeof(serialNum); > + signer.SignerId.IssuerSerialNumber.SerialNumber.pbData = serialNum; > + signer.HashAlgorithm.pszObjId = oid_rsa_md5; > + CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, buf, &size); > + compare_cms_signer_info((CMSG_CMS_SIGNER_INFO *)buf, &signer); > + CryptMemFree(buf); > + } > /* index is ignored when getting signer count */ > size = sizeof(value); > ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 1, &value, &size); > @@ -2383,6 +2456,68 @@ static void test_decode_msg_get_param(void) > CMSG_COMPUTED_HASH_PARAM, signedWithCertAndCrlComputedHash, > sizeof(signedWithCertAndCrlComputedHash)); > CryptMsgClose(msg); > + > + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); > + ret = CryptMsgUpdate(msg, signedKeyIdEmptyContent, > + sizeof(signedKeyIdEmptyContent), TRUE); > + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); > + size = sizeof(value); > + ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &value, &size); > + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); > + ok(value == 1, "Expected 1 signer, got %d\n", value); > + /* Getting the regular (non-CMS) signer info from a CMS message is also > + * possible.. > + */ > + size = 0; > + ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); > + todo_wine > + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); > + if (ret) > + buf = CryptMemAlloc(size); > + else > + buf = NULL; > + if (buf) > + { > + CMSG_SIGNER_INFO signer; > + BYTE zero = 0; > + > + /* and here's the little oddity: for a CMS message using the key id > + * variant of a SignerId, retrieving the CMSG_SIGNER_INFO param yields > + * a signer with a zero (not empty) serial number, and whose issuer is > + * an RDN with OID szOID_KEYID_RDN, value type CERT_RDN_OCTET_STRING, > + * and value of the key id. > + */ > + signer.dwVersion = CMSG_SIGNED_DATA_V3; > + signer.Issuer.cbData = sizeof(keyIdIssuer); > + signer.Issuer.pbData = keyIdIssuer; > + signer.SerialNumber.cbData = 1; > + signer.SerialNumber.pbData = &zero; > + CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, buf, &size); > + compare_signer_info((CMSG_SIGNER_INFO *)buf, &signer); > + CryptMemFree(buf); > + } > + size = 0; > + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); > + todo_wine > + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); > + if (ret) > + buf = CryptMemAlloc(size); > + else > + buf = NULL; > + if (buf) > + { > + CMSG_CMS_SIGNER_INFO signer = { 0 }; > + > + signer.dwVersion = CMSG_SIGNED_DATA_V3; > + signer.SignerId.dwIdChoice = CERT_ID_KEY_IDENTIFIER; > + signer.SignerId.KeyId.cbData = sizeof(serialNum); > + signer.SignerId.KeyId.pbData = (BYTE *)serialNum; > + signer.HashAlgorithm.pszObjId = oid_rsa_md5; > + CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, buf, &size); > + compare_cms_signer_info((CMSG_CMS_SIGNER_INFO *)buf, &signer); > + CryptMemFree(buf); > + } > + CryptMsgClose(msg); > } > > static void test_decode_msg(void) > -- 1.5.2.2 > ------------------------------------------------------------------------ > > -- 1.5.2.2 ------------------------------------------------------------------------ -- Eric Pouech "The problem with designing something completely foolproof is to underestimate the ingenuity of a complete idiot." (Douglas Adams)

2 1

Re: [PATCH] AcceptEx Impelementation
by Kai Blin 20 Aug '08

20 Aug '08

Hi Scott, I didn't see a reply to your AcceptEx patches yet, sorry if I missed it and you get this again. Please submit one patch per email only. I admittedly don't know much about the wineserver stuff, but I've noticed a couple of style issues in the winsock code: The indentation common in socket.c is either a two-space indent or a four-space indent. Please don't add new code with an eight-space indent. Also, the common convention for ifs is if (cond) { and not if(cond){ Apart from those minor nitpicks, the code looks good. Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

5 9

Re: [9/10] WineD3D: Update the overlay when the destination was drawn to
by Alexandre Julliard 20 Aug '08

20 Aug '08

Stefan Dösinger <stefan(a)codeweavers.com> writes: > @@ -4550,13 +4558,22 @@ static WINED3DSURFTYPE WINAPI IWineD3DSurfaceImpl_GetImplType(IWineD3DSurface *i > static HRESULT WINAPI IWineD3DSurfaceImpl_DrawOverlay(IWineD3DSurface *iface) { > IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; > HRESULT hr; > + static BOOL recursive = FALSE; That static looks very suspicious. It should either be stored in the object or use some sort of locking. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: 1/3 dpnet: Add basic DirectPlay8Peer implementation
by Alexandre Julliard 20 Aug '08

20 Aug '08

Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> writes: > +static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(PDIRECTPLAY8PEER iface, PVOID CONST pvUserContext, CONST PFNDPNMESSAGEHANDLER pfn, CONST DWORD dwFlags) > +{ > + FIXME("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); > + > + return DPN_OK; > +} > + > +static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(PDIRECTPLAY8PEER iface, CONST GUID *CONST pguidServiceProvider, CONST GUID *CONST pguidApplication, DPN_SERVICE_PROVIDER_INFO *CONST pSPInfoBuffer, DWORD *CONST pcbEnumData, DWORD *CONST pcReturned, CONST DWORD dwFlags) > +{ > + FIXME("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); > + return DPN_OK; > +} Returning OK from stubs is usually not a good idea. > +static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = > +{ > + IDirectPlay8PeerImpl_QueryInterface, > + IDirectPlay8PeerImpl_AddRef, > + IDirectPlay8PeerImpl_Release, > + IDirectPlay8PeerImpl_Initialize, > + IDirectPlay8PeerImpl_EnumServiceProviders > +}; You can't initialize a vtbl partially, you need to stub all the functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: gdi32/tests/bitmap: Fix win9x detection
by Alexandre Julliard 20 Aug '08

20 Aug '08

Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> writes: > In commit 48bb687dfb00b00f789b688459ad5d0ec77a617b, win9x detection was > changed to use the desktop window instead of a private EDIT window as > target for GetWindowLongW. GetWindowLongW(GetDesktopWindow(),GWLP_WNDPROC) > fails on wine (and probably on WinNT as well, as the counts on > test.winehq.org indicate). > > I am unsure about this patch, as I don't know whether is_win9x now > gets true if one has a Windows 98 system with the Microsoft Layer > for Unicode installed. The right way is to get rid of the check, especially since the GetWindowLongW behavior is irrelevant to what the test is doing. It should be using something like broken() instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msxml3: Add ISAXContentHandler_endPrefix event (1/9) [try2]
by Alexandre Julliard 20 Aug '08

20 Aug '08

Piotr Caban <piotr.caban(a)gmail.com> writes: > @@ -117,6 +120,29 @@ static inline saxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface ) > } > > > +static HRESULT namespacePush(saxlocator *locator, int ns) > +{ > + if(locator->nsStackLast>=locator->nsStackSize) > + { > + int *new_stack; > + > + locator->nsStackSize *= 2; > + new_stack = HeapReAlloc(GetProcessHeap(), 0, > + locator->nsStack, locator->nsStackSize); > + if(!new_stack) return E_OUTOFMEMORY; > + locator->nsStack = new_stack; You need to preserve nsStackSize on error too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Avoiding charset corruption when sending patches
by Dan Kegel 20 Aug '08

20 Aug '08

Short story: Patches that touch non-Latin1 .rc files might need to be sent as attached non-text files rather than inline or as .txt files, to avoid charset corruption. Some examples: http://winehq.org/pipermail/wine-patches/2008-August/059095.html might suffer corruption (I can't tell offhand). http://winehq.org/pipermail/wine-patches/2008-August/059405.html looks safe, though. Long story: Patchwatcher was converting patches to utf-8, causing the patch [1/3] wined3d: Move creating a texture id from PreLoad to BindTexture to not apply. Thanks to Henri Verbeet for diagnosing the problem. The patchwatcher web page may need some surgery to deal with this. Currently it uses a single .txt file for the email message and the patch, which probably tempts the web server and browser to do charset conversions. I will probably switch the suffix to .bin to discourage this. Even longer story: So, what character set is the Wine source tree encoded with? It looks like a mixture: 1. in general, .c and .h files are encoded in Latin-1 aka iso8859-1. 2. include/*.h are encoded in ASCII and are not allowed to have non-ascii chars; see http://bugs.winehq.org/show_bug.cgi?id=5420 3. *_XX.rc (or XX.rc) are in the character set that Windows defaults to for language XX, unless changed by a #pragma code_page... in the .rc file. http://wiki.winehq.org/Developers-Hints#head-ef42a958e4f633dbd4a0ae42649fa0… Which brings us to the question: since email clients love changing charsets of text messages, how can we avoid corrupting patches when sending them via email? It kind of looks like patches to .rc files must be attached rather than inline, and should be attached as .patch, .diff, or .bin files so they are marked with the mime type application/octet-stream which should inhibit all charset conversions. (Attaching as .txt might tempt mail clients to perform charset conversions on them.) - Dan

2 1

Re: [PATCH 2/5] mstask: Implemented (Set|Get)ApplicationName. (Revision)
by Alexandre Julliard 20 Aug '08

20 Aug '08

Roy Shea <royshea(a)gmail.com> writes: > @@ -323,16 +324,62 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName( > ITask* iface, > LPCWSTR pwszApplicationName) > { > - FIXME("(%p, %s): stub\n", iface, debugstr_w(pwszApplicationName)); > - return E_NOTIMPL; > + DWORD n; > + TaskImpl *This = (TaskImpl *)iface; > + > + TRACE("(%p, %s)\n", iface, debugstr_w(pwszApplicationName)); > + > + HeapFree(GetProcessHeap(), 0, This->applicationName); > + This->applicationName = NULL; You need to preserve the previous value on error. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [NJS#80611] re: msvcmaker: fix project file generation under MinGW32
by Hongbo Ni 20 Aug '08

20 Aug '08

At 03:25 AM 2008-08-20, Dan Kegel wrote: >Hongbo, it looks like your patch failed to apply because you did not >preserve whitespace exactly. Your patch uses all spaces >for the context, but the file contains tabs, so it does not match, >and patch fails. Thank you Dan, and thanks to Patchwatcher. I will fix it and resubmit. Hongbo Ni Hongbo Ni <hongbo(a)njstar.com> +----------------------------------------------------------------+ * NJStar Software Corp., P.O. Box 40, Epping NSW 2121, Australia. * Tel: +61-2-9869-1088 WebSite: http://www.njstar.com * Fax: +61-2-9869-1099 Email: http://njstar.com/contact/ * eFax: +1-253-595-4788 +----------------------------------------------------------------+

1 0

Incidental patch cleaning?
by Andrew Talbot 19 Aug '08

19 Aug '08

Hi, Is it possible to sneak in a bit of patch cleaning within the new software? It would be useful to incidentally remove any trailing white space that happens to exist within the scope of a patch. -- Andy.

3 2