July 2007 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Test and implement getting the encoded signers from an encoded signed message .
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: f987ca01d0c30481fae09158ff71d4cf15260691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f987ca01d0c30481fae09158f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 24 11:18:52 2007 -0700 crypt32: Test and implement getting the encoded signers from an encoded signed message. --- dlls/crypt32/msg.c | 9 ++++++++- dlls/crypt32/tests/msg.c | 14 +++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 8a1fea0..ba75cb6 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -865,12 +865,19 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CryptGetHashParam(msg->signerHandles[dwIndex].hash, HP_HASHVAL, pvData, pcbData, 0); break; + case CMSG_ENCODED_SIGNER: + if (dwIndex >= msg->info.cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CryptEncodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + PKCS7_SIGNER_INFO, &msg->info.rgSignerInfo[dwIndex], 0, NULL, + pvData, pcbData); + break; case CMSG_VERSION_PARAM: ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->info.version, sizeof(msg->info.version)); break; default: - FIXME("unimplemented for %d\n", dwParamType); SetLastError(CRYPT_E_INVALID_MSG_TYPE); } return ret; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8665594..3bd0882 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1256,6 +1256,15 @@ static const BYTE signedContent[] = { static const BYTE signedHash[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26, 0x2f }; +static const BYTE signedEncodedSigner[] = { +0x30,0x75,0x02,0x01,0x01,0x30,0x1a,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03, +0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, +0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05, +0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x40,0x81,0xa6,0x70,0xb3,0xef, +0x59,0xd1,0x66,0xd1,0x9b,0xc0,0x9a,0xb6,0x9a,0x5e,0x6d,0x6f,0x6d,0x0d,0x59, +0xa9,0xaa,0x6e,0xe9,0x2c,0xa0,0x1e,0xee,0xc2,0x60,0xbc,0x59,0xbe,0x3f,0x63, +0x06,0x8d,0xc9,0x11,0x1d,0x23,0x64,0x92,0xef,0x2e,0xfc,0x57,0x29,0xa4,0xaf, +0xe0,0xee,0x93,0x19,0x39,0x51,0xe4,0x44,0xb8,0x0b,0x28,0xf4,0xa8,0x0d }; static BYTE cert[] = { 0x30,0x7a,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11, 0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, @@ -1427,6 +1436,8 @@ static void test_signed_msg_encoding(void) ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, NULL, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); + check_param("detached signed encoded signer", msg, CMSG_ENCODED_SIGNER, + signedEncodedSigner, sizeof(signedEncodedSigner)); CryptMsgClose(msg); @@ -1536,7 +1547,6 @@ static void test_signed_msg_get_param(void) size = 0; SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); SetLastError(0xdeadbeef); @@ -1573,14 +1583,12 @@ static void test_signed_msg_get_param(void) */ size = 0; ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); size = 0; SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 1, NULL, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

H. Verbeet : wined3d: Pass the correct target to glMultiTexCoord.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: e652128fdf7655365a920d389e85321a0387c750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e652128fdf7655365a920d389… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 24 23:38:31 2007 +0200 wined3d: Pass the correct target to glMultiTexCoord. --- dlls/wined3d/drawprim.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 721d913..1d0c0d3 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -458,7 +458,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case WINED3DTTFF_COUNT1: VTRACE(("tex:%d, s=%f\n", textureNo, s)); if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord1fARB(texture_idx, s)); + GL_EXTCALL(glMultiTexCoord1fARB(GL_TEXTURE0_ARB + texture_idx, s)); } else { glTexCoord1f(s); } @@ -466,7 +466,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case WINED3DTTFF_COUNT2: VTRACE(("tex:%d, s=%f, t=%f\n", textureNo, s, t)); if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord2fARB(texture_idx, s, t)); + GL_EXTCALL(glMultiTexCoord2fARB(GL_TEXTURE0_ARB + texture_idx, s, t)); } else { glTexCoord2f(s, t); } @@ -474,7 +474,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case WINED3DTTFF_COUNT3: VTRACE(("tex:%d, s=%f, t=%f, r=%f\n", textureNo, s, t, r)); if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord3fARB(texture_idx, s, t, r)); + GL_EXTCALL(glMultiTexCoord3fARB(GL_TEXTURE0_ARB + texture_idx, s, t, r)); } else { glTexCoord3f(s, t, r); } @@ -482,7 +482,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case WINED3DTTFF_COUNT4: VTRACE(("tex:%d, s=%f, t=%f, r=%f, q=%f\n", textureNo, s, t, r, q)); if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord4fARB(texture_idx, s, t, r, q)); + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + texture_idx, s, t, r, q)); } else { glTexCoord4f(s, t, r, q); }

1 0

Michael Stefaniuc : mscms: Don' t produce unreachable code during conditional compilation.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 2fe189fd09d9daf4220b76255c117ca7b95c8da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe189fd09d9daf4220b76255… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 24 22:29:05 2007 +0200 mscms: Don't produce unreachable code during conditional compilation. --- dlls/mscms/profile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 8c9d73c..4ecb361 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -305,7 +305,6 @@ BOOL WINAPI GetColorProfileFromHandle( HPROFILE profile, PBYTE buffer, PDWORD si */ BOOL WINAPI GetColorProfileHeader( HPROFILE profile, PPROFILEHEADER header ) { - BOOL ret = FALSE; #ifdef HAVE_LCMS icProfile *iccprofile = MSCMS_hprofile2iccprofile( profile ); @@ -316,8 +315,9 @@ BOOL WINAPI GetColorProfileHeader( HPROFILE profile, PPROFILEHEADER header ) MSCMS_get_profile_header( iccprofile, header ); return TRUE; +#else + return FALSE; #endif /* HAVE_LCMS */ - return ret; } /****************************************************************************** @@ -1065,7 +1065,6 @@ BOOL WINAPI SetColorProfileElement( HPROFILE profile, TAGTYPE type, DWORD offset */ BOOL WINAPI SetColorProfileHeader( HPROFILE profile, PPROFILEHEADER header ) { - BOOL ret = FALSE; #ifdef HAVE_LCMS icProfile *iccprofile = MSCMS_hprofile2iccprofile( profile ); DWORD access = MSCMS_hprofile2access( profile ); @@ -1078,8 +1077,9 @@ BOOL WINAPI SetColorProfileHeader( HPROFILE profile, PPROFILEHEADER header ) MSCMS_set_profile_header( iccprofile, header ); return TRUE; +#else + return FALSE; #endif /* HAVE_LCMS */ - return ret; } /******************************************************************************

1 0

Andrew Talbot : msxml3: Cast-qual warning fix.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 11904c80fa5029fab9b608cf22d9fe11877b782b URL: http://source.winehq.org/git/wine.git/?a=commit;h=11904c80fa5029fab9b608cf2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jul 24 19:16:09 2007 +0100 msxml3: Cast-qual warning fix. --- dlls/msxml3/xmlelem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index cf2a21a..bd3c8a6 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -229,7 +229,7 @@ static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR strPropertyN ptr = This->node->properties; while (ptr) { - if (!lstrcmpiA((LPSTR)name, (LPSTR)ptr->name)) + if (!lstrcmpiA((LPSTR)name, (LPCSTR)ptr->name)) { val = xmlNodeListGetString(ptr->doc, ptr->children, 1); break;

1 0

Aric Stewart : ws2_32: Initialize the address to 0 in ws_sockaddr_ws2u.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: d35857dfbf1641941b849deb935d5765fc5d3450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35857dfbf1641941b849deb9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 24 07:52:27 2007 -0500 ws2_32: Initialize the address to 0 in ws_sockaddr_ws2u. --- dlls/ws2_32/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5a27fce..13878a7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -854,6 +854,7 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd return 0; uaddrlen = sizeof(struct sockaddr_ipx); + memset( uaddr, 0, uaddrlen ); uipx->sipx_family=AF_IPX; uipx->sipx_port=wsipx->sa_socket; /* copy sa_netnum and sa_nodenum to sipx_network and sipx_node @@ -876,6 +877,7 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd */ if (wsaddrlen >= sizeof(struct WS_sockaddr_in6_old)) { uaddrlen = sizeof(struct sockaddr_in6); + memset( uaddr, 0, uaddrlen ); uin6->sin6_family = AF_INET6; uin6->sin6_port = win6->sin6_port; uin6->sin6_flowinfo = win6->sin6_flowinfo; @@ -895,6 +897,7 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd if (wsaddrlen<sizeof(struct WS_sockaddr_in)) return 0; uaddrlen = sizeof(struct sockaddr_in); + memset( uaddr, 0, uaddrlen ); uin->sin_family = AF_INET; uin->sin_port = win->sin_port; memcpy(&uin->sin_addr,&win->sin_addr,4); /* 4 bytes = 32 address bits */

1 0

Paul Vriens : advapi32/service: Add another test for GetServiceDisplayName.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 05e1539b2b8703457604193cc7e6fe6611fa7b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e1539b2b8703457604193cc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 24 15:35:53 2007 +0200 advapi32/service: Add another test for GetServiceDisplayName. --- dlls/advapi32/tests/service.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index adbfe2b..491b511 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -385,6 +385,7 @@ static void test_get_displayname(void) WCHAR displaynameW[2048]; DWORD displaysize, tempsize, tempsizeW; static const CHAR spooler[] = "Spooler"; + static const CHAR deadbeef[] = "Deadbeef"; static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; /* Having NULL for the size of the buffer will crash on W2K3 */ @@ -412,6 +413,15 @@ static void test_get_displayname(void) GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Test for non-existing service */ + SetLastError(0xdeadbeef); + displaysize = -1; + ret = GetServiceDisplayNameA(scm_handle, deadbeef, NULL, &displaysize); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + /* Check if 'Spooler' exists */ svc_handle = OpenServiceA(scm_handle, spooler, GENERIC_READ); if (!svc_handle)

1 0

Paul Vriens : advapi32/service: Close a handle on failure.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 7625c3bf37c8f9cf027f4fdd55785274e56c6fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7625c3bf37c8f9cf027f4fdd5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 24 20:55:38 2007 +0200 advapi32/service: Close a handle on failure. --- dlls/advapi32/tests/service.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 491b511..4ce8564 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -427,6 +427,7 @@ static void test_get_displayname(void) if (!svc_handle) { skip("Spooler service doesn't exist\n"); + CloseServiceHandle(scm_handle); return; } CloseServiceHandle(svc_handle);

1 0

Konstantin Kondratyuk : ntdll: Add Samara time zone.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: b7c38b0d755b6d4248c8caa930445d2a563d524b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c38b0d755b6d4248c8caa93… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Tue Jul 24 08:57:55 2007 +0400 ntdll: Add Samara time zone. --- dlls/ntdll/time.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 08e09b0..256be42 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -277,7 +277,10 @@ static const struct tagTZ_INFO TZ_INFO[] = 'r','d',' ','T','i','m','e','\0'}, -270, 0}, {"SAMT", {'S','a','m','a','r','a',' ','S','t','a','n','d','a','r','d',' ','T','i', - 'm','e','\0'}, -270, 1}, + 'm','e','(','W','i','n','t','e','r',')','\0'}, -240, 0}, + {"SAMST", + {'S','a','m','a','r','a',' ','D','a','y','l','i','g','h','t',' ','T','i', + 'm','e','(','S','u','m','m','e','r',')','\0'}, -300, 1}, {"YEKT", {'U','r','a','l','s',' ','S','t','a','n','d','a','r','d', ' ','T','i','m','e',' ','(','W','i','n','t','e','r',')','\0'}, -300, 0},

1 0

Paul Vriens : advapi32/service: Add tests for GetServiceKeyName.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: f0e07382cd7e592992c4b9965e237c063319f675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e07382cd7e592992c4b9965… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 24 20:58:35 2007 +0200 advapi32/service: Add tests for GetServiceKeyName. --- dlls/advapi32/tests/service.c | 94 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4ce8564..476c26e 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -29,6 +29,8 @@ #include "wine/test.h" +static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms */ + static void test_open_scm(void) { SC_HANDLE scm_handle; @@ -143,7 +145,6 @@ static void test_create_delete_svc(void) static const CHAR servicename [] = "Winetest"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; - static const CHAR spooler [] = "Spooler"; /* Should be available on all platforms */ static const CHAR password [] = "secret"; BOOL spooler_exists = FALSE; BOOL ret; @@ -384,7 +385,6 @@ static void test_get_displayname(void) CHAR displayname[4096]; WCHAR displaynameW[2048]; DWORD displaysize, tempsize, tempsizeW; - static const CHAR spooler[] = "Spooler"; static const CHAR deadbeef[] = "Deadbeef"; static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; @@ -485,6 +485,95 @@ static void test_get_displayname(void) CloseServiceHandle(scm_handle); } +static void test_get_servicekeyname(void) +{ + SC_HANDLE scm_handle, svc_handle; + CHAR servicename[4096]; + CHAR displayname[4096]; + DWORD servicesize, displaysize, tempsize; + BOOL ret; + static const CHAR deadbeef[] = "Deadbeef"; + + /* Having NULL for the size of the buffer will crash on W2K3 */ + + SetLastError(0xdeadbeef); + ret = GetServiceKeyNameA(NULL, NULL, NULL, &servicesize); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + + SetLastError(0xdeadbeef); + ret = GetServiceKeyNameA(scm_handle, NULL, NULL, &servicesize); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, XP, W2K3, Vista */ || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, + "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Valid handle and buffer but no displayname */ + SetLastError(0xdeadbeef); + ret = GetServiceKeyNameA(scm_handle, NULL, servicename, &servicesize); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, XP, W2K3, Vista */ || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, + "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Test for non-existing displayname */ + SetLastError(0xdeadbeef); + ret = GetServiceKeyNameA(scm_handle, deadbeef, NULL, &servicesize); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + + /* Check if 'Spooler' exists */ + svc_handle = OpenServiceA(scm_handle, spooler, GENERIC_READ); + if (!svc_handle) + { + skip("Spooler service doesn't exist\n"); + CloseServiceHandle(scm_handle); + return; + } + CloseServiceHandle(svc_handle); + + /* Get the displayname for the 'Spooler' service */ + GetServiceDisplayNameA(scm_handle, spooler, NULL, &displaysize); + GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); + + /* Retrieve the needed size for the buffer */ + SetLastError(0xdeadbeef); + servicesize = 0; + ret = GetServiceKeyNameA(scm_handle, displayname, NULL, &servicesize); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + /* Valid call with the correct buffersize */ + SetLastError(0xdeadbeef); + tempsize = servicesize; + servicesize *= 2; + ret = GetServiceKeyNameA(scm_handle, displayname, servicename, &servicesize); + todo_wine + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || + GetLastError() == ERROR_IO_PENDING /* W2K */ || + GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + todo_wine + { + ok(lstrlen(servicename) == tempsize/2, + "Expected the buffer to be twice the length of the string\n") ; + ok(!lstrcmpi(servicename, spooler), "Expected %s, got %s\n", spooler, servicename); + } + + CloseServiceHandle(scm_handle); +} + static void test_close(void) { SC_HANDLE handle; @@ -749,6 +838,7 @@ START_TEST(service) test_open_svc(); test_create_delete_svc(); test_get_displayname(); + test_get_servicekeyname(); test_close(); /* Test the creation, querying and deletion of a service */ test_sequence();

1 0

Marcus Meissner : crypt32: Fixed wrong allocation size.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 60ef860f174e1e9f46daa3acffd3647279c51543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ef860f174e1e9f46daa3acf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 24 21:16:01 2007 +0200 crypt32: Fixed wrong allocation size. --- dlls/crypt32/encode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 7d46521..7359ed8 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1231,7 +1231,7 @@ static BOOL WINAPI CRYPT_DEREncodeItemsAsSet(DWORD dwCertEncodingType, if (desc->cItems) { - setOf.rgValue = CryptMemAlloc(setOf.cValue * sizeof(CRYPT_DER_BLOB)); + setOf.rgValue = CryptMemAlloc(desc->cItems * sizeof(CRYPT_DER_BLOB)); if (!setOf.rgValue) ret = FALSE; else

1 0