November 2009 - Wine-Commits

Juan Lang : crypt32: Permit lack of key usage extension on root certificates.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: d94e4d315a573db454eb4ec3761242ff8b3c24e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94e4d315a573db454eb4ec37… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 13:12:07 2009 -0800 crypt32: Permit lack of key usage extension on root certificates. This reverts 60770fb011b0a60d7862e7fe9c7a6d24d68ac0ad, although it updates the comments to give a reason. Thanks to Matt Van Gundy for pointing it out to me. --- dlls/crypt32/chain.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c4ecfa4..c9ca356 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1083,7 +1083,7 @@ static void dump_element(PCCERT_CONTEXT cert) } static BOOL CRYPT_KeyUsageValid(PCertificateChainEngine engine, - PCCERT_CONTEXT cert, BOOL isCA, DWORD index) + PCCERT_CONTEXT cert, BOOL isRoot, BOOL isCA, DWORD index) { PCERT_EXTENSION ext; BOOL ret; @@ -1132,20 +1132,24 @@ static BOOL CRYPT_KeyUsageValid(PCertificateChainEngine engine, * perhaps this is prudent. On the other hand, MS also accepts V3 * certs without key usage extensions. We are more restrictive: * we accept locally installed V1 or V2 certs as CA certs. + * We also accept a lack of key usage extension on root certs, + * which is implied in RFC 5280, section 6.1: the trust anchor's + * only requirement is that it was used to issue the next + * certificate in the chain. */ - ret = FALSE; - if (cert->pCertInfo->dwVersion == CERT_V1 || + if (isRoot) + ret = TRUE; + else if (cert->pCertInfo->dwVersion == CERT_V1 || cert->pCertInfo->dwVersion == CERT_V2) { PCCERT_CONTEXT localCert = CRYPT_FindCertInStore( engine->hWorld, cert); - if (localCert) - { - CertFreeCertificateContext(localCert); - ret = TRUE; - } + ret = localCert != NULL; + CertFreeCertificateContext(localCert); } + else + ret = FALSE; if (!ret) WARN_(chain)("no key usage extension on a CA cert\n"); } @@ -1273,8 +1277,15 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, chain->cElement, debugstr_w(filetime_to_str(time))); for (i = chain->cElement - 1; i >= 0; i--) { + BOOL isRoot; + if (TRACE_ON(chain)) dump_element(chain->rgpElement[i]->pCertContext); + if (i == chain->cElement - 1) + isRoot = CRYPT_IsCertificateSelfSigned( + chain->rgpElement[i]->pCertContext); + else + isRoot = FALSE; if (CertVerifyTimeValidity(time, chain->rgpElement[i]->pCertContext->pCertInfo) != 0) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= @@ -1316,7 +1327,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_TRUST_INVALID_BASIC_CONSTRAINTS; } if (!CRYPT_KeyUsageValid(engine, chain->rgpElement[i]->pCertContext, - constraints.fCA, i)) + isRoot, constraints.fCA, i)) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_VALID_FOR_USAGE; if (i != 0)

1 0

Kai Blin : netapi32: Implement NetUserGetGroups stub.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: a61044b6757f134ca139a23f7032e261463b1c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61044b6757f134ca139a23f7… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 7 07:45:13 2009 +0100 netapi32: Implement NetUserGetGroups stub. --- dlls/netapi32/netapi32.spec | 2 +- dlls/netapi32/wksta.c | 23 +++++++++++++++++++++++ include/lmaccess.h | 1 + 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index eb3b841..6470280 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -205,7 +205,7 @@ @ stdcall NetUserChangePassword(wstr wstr wstr wstr) @ stdcall NetUserDel(wstr wstr) @ stdcall NetUserEnum(wstr long long ptr long ptr ptr ptr) -@ stub NetUserGetGroups +@ stdcall NetUserGetGroups(wstr wstr long ptr long ptr ptr) @ stdcall NetUserGetInfo(wstr wstr long ptr) @ stdcall NetUserGetLocalGroups(wstr wstr long long ptr long ptr ptr) @ stdcall NetUserModalsGet(wstr long ptr) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 67690b8..122a685 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -591,3 +591,26 @@ NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( return NERR_Success; } + +/************************************************************ + * NetUserGetGroups (NETAPI32.@) + */ +NET_API_STATUS NET_API_FUNCTION NetUserGetGroups( + LPCWSTR servername, + LPCWSTR username, + DWORD level, + LPBYTE *bufptr, + DWORD prefixmaxlen, + LPDWORD entriesread, + LPDWORD totalentries) +{ + FIXME("%s %s %d %p %d %p %p stub\n", debugstr_w(servername), + debugstr_w(username), level, bufptr, prefixmaxlen, entriesread, + totalentries); + + *bufptr = NULL; + *entriesread = 0; + *totalentries = 0; + + return ERROR_INVALID_LEVEL; +} diff --git a/include/lmaccess.h b/include/lmaccess.h index c29a40c..03bd504 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -467,6 +467,7 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetUserDel(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetUserEnum(LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR,LPCWSTR,DWORD,LPBYTE*); +NET_API_STATUS WINAPI NetUserGetGroups(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserGetLocalGroups(LPCWSTR,LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR,DWORD,LPBYTE*);

1 0

Dan Kegel : user32: Fix uninitialized variable so first call to DdeGetLastError isn' t undefined.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 75d613f64f418afafb584c794d79c9e87c0181ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d613f64f418afafb584c794… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Nov 5 19:16:34 2009 -0800 user32: Fix uninitialized variable so first call to DdeGetLastError isn't undefined. --- dlls/user32/dde_misc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 1a9b662..d2de954 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -380,6 +380,7 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, pInstance->nodeList = NULL; /* node will be added later */ pInstance->monitorFlags = afCmd & MF_MASK; pInstance->wStatus = 0; + pInstance->lastError = DMLERR_NO_ERROR; pInstance->servers = NULL; pInstance->convs[0] = NULL; pInstance->convs[1] = NULL;

1 0

Juan Lang : crypt32: Permit lack of basic constraints extension on root certificates.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 5274777b1c090d81d52e8a42a989b27b9e0ab3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5274777b1c090d81d52e8a42a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 13:15:43 2009 -0800 crypt32: Permit lack of basic constraints extension on root certificates. --- dlls/crypt32/chain.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c9ca356..5323ac4 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -427,6 +427,10 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, * through out-of-band means or reject the certificate." Rejecting the * certificate prohibits a large number of commonly used certificates, so * accepting locally installed ones is a compromise. + * Root certificates are also allowed to be CAs even without a basic + * constraints extension. This is implied by RFC 5280, section 6.1: the + * root of a certificate chain's only requirement is that it was used to issue + * the next certificate in the chain. * Updates chainConstraints with the element's constraints, if: * 1. chainConstraints doesn't have a path length constraint, or * 2. element's path length constraint is smaller than chainConstraints's @@ -437,12 +441,14 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, */ static BOOL CRYPT_CheckBasicConstraintsForCA(PCertificateChainEngine engine, PCCERT_CONTEXT cert, CERT_BASIC_CONSTRAINTS2_INFO *chainConstraints, - DWORD remainingCAs, BOOL *pathLengthConstraintViolated) + DWORD remainingCAs, BOOL isRoot, BOOL *pathLengthConstraintViolated) { BOOL validBasicConstraints, implicitCA = FALSE; CERT_BASIC_CONSTRAINTS2_INFO constraints; - if (cert->pCertInfo->dwVersion == CERT_V1 || + if (isRoot) + implicitCA = TRUE; + else if (cert->pCertInfo->dwVersion == CERT_V1 || cert->pCertInfo->dwVersion == CERT_V2) { BYTE hash[20]; @@ -1307,7 +1313,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_INVALID_BASIC_CONSTRAINTS; else if (!CRYPT_CheckBasicConstraintsForCA(engine, - chain->rgpElement[i]->pCertContext, &constraints, i - 1, + chain->rgpElement[i]->pCertContext, &constraints, i - 1, isRoot, &pathLengthConstraintViolated)) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_INVALID_BASIC_CONSTRAINTS;

1 0

Paul Chitescu : crypt32: Check the result of CryptAcquireContextW() when initializing default provider.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 7223d8b6d2f03533799eac3f958708042ce21cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7223d8b6d2f03533799eac3f9… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Nov 6 14:18:14 2009 +0200 crypt32: Check the result of CryptAcquireContextW() when initializing default provider. --- dlls/crypt32/main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index d93163c..1a5972f 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -64,8 +64,9 @@ HCRYPTPROV CRYPT_GetDefaultProvider(void) { HCRYPTPROV prov; - CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, - CRYPT_VERIFYCONTEXT); + if (!CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT)) + return hDefProv; InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, NULL); if (hDefProv != prov)

1 0

Juan Lang : rsaenh: Explicitly clear unused memory when exporting a private key.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 49c11910d8e0856715d14567c48a2489ff92d80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c11910d8e0856715d14567c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 09:49:00 2009 -0800 rsaenh: Explicitly clear unused memory when exporting a private key. --- dlls/rsaenh/implglue.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 68a9380..3477210 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -397,24 +397,45 @@ BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD { mp_to_unsigned_bin(&pKeyContext->rsa.N, pbDest); reverse_bytes(pbDest, dwKeyLen); + if (mp_unsigned_bin_size(&pKeyContext->rsa.N) < dwKeyLen) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.N), 0, + dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.N)); pbDest += dwKeyLen; mp_to_unsigned_bin(&pKeyContext->rsa.p, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.p) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.p), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.p)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.q, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.q) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.q), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.q)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.dP, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.dP) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.dP), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.dP)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.dQ, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.dQ) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.dQ), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.dQ)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.qP, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.qP) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.qP), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.qP)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.d, pbDest); reverse_bytes(pbDest, dwKeyLen); + if (mp_unsigned_bin_size(&pKeyContext->rsa.d) < dwKeyLen) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.d), 0, + dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.d)); *pdwPubExp = (DWORD)mp_get_int(&pKeyContext->rsa.e); return TRUE;

1 0

Jörg Höhle : mciwave: Set wave format PCM is the only one accepted.
by Alexandre Julliard Nov. 5, 2009

Nov. 5, 2009

Module: wine Branch: master Commit: 518f4f8cdb035aa7a0820448deabe533f19bae35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518f4f8cdb035aa7a0820448d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 18:31:15 2009 +0200 mciwave: Set wave format PCM is the only one accepted. --- dlls/mciwave/mciwave.c | 10 +++++----- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 0c17f32..fc1c2b2 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1310,6 +1310,11 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpPa TRACE("MCI_WAVE_SET_ANYINPUT !\n"); if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) TRACE("MCI_WAVE_SET_ANYOUTPUT !\n"); + if (dwFlags & MCI_WAVE_SET_FORMATTAG) { + TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", ((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag); + if (((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag != WAVE_FORMAT_PCM) + return MCIERR_OUTOFRANGE; + } if (dwFlags & MCI_WAVE_SET_AVGBYTESPERSEC) { wmw->wfxRef.nAvgBytesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nAvgBytesPerSec; TRACE("MCI_WAVE_SET_AVGBYTESPERSEC = %d\n", wmw->wfxRef.nAvgBytesPerSec); @@ -1326,11 +1331,6 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpPa wmw->wfxRef.nChannels = ((LPMCI_WAVE_SET_PARMS)lpParms)->nChannels; TRACE("MCI_WAVE_SET_CHANNELS = %d\n", wmw->wfxRef.nChannels); } - if (dwFlags & MCI_WAVE_SET_FORMATTAG) { - /* Dangerous because the correct cbSize cannot be set */ - wmw->wfxRef.wFormatTag = ((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag; - TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", wmw->wfxRef.wFormatTag); - } if (dwFlags & MCI_WAVE_SET_SAMPLESPERSEC) { wmw->wfxRef.nSamplesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nSamplesPerSec; TRACE("MCI_WAVE_SET_SAMPLESPERSEC = %d\n", wmw->wfxRef.nSamplesPerSec); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 59cf4ae..e84f108 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -233,7 +233,7 @@ static void test_recordWAVE(HWND hwnd) /* MCI seems to solely support PCM, no need for ACM conversion. */ err = mciSendString("set x format tag 2", NULL, 0, NULL); - todo_wine ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned error: %d\n", err); + ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned error: %d\n", err); err = mciSendString("set x format tag pcm", NULL, 0, NULL); ok(!err,"mci set format tag pcm returned error: %d\n", err);

1 0

Jörg Höhle : winmm: Do not crash on NULL MCI Sysinfo command output buffer pointer.
by Alexandre Julliard Nov. 5, 2009

Nov. 5, 2009

Module: wine Branch: master Commit: f177e613380010335fb0876213d619a376deae18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f177e613380010335fb087621… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 18:41:10 2009 +0200 winmm: Do not crash on NULL MCI Sysinfo command output buffer pointer. --- dlls/winmm/mci.c | 4 ++-- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index e28a298..c6f3701 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1746,8 +1746,8 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm LPWINE_MCIDRIVER wmd; HKEY hKey; - if (lpParms == NULL || lpParms->lpstrReturn == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms->lpstrReturn == NULL) return MCIERR_PARAM_OVERFLOW; TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 4151664..59cf4ae 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -511,7 +511,7 @@ static void test_AutoOpenWAVE(HWND hwnd) /* Do not crash on NULL buffer pointer */ err = mciSendString("sysinfo waveaudio quantity open", NULL, 0, NULL); - todo_wine ok(err==MCIERR_PARAM_OVERFLOW,"mci sysinfo without buffer returned error: %d\n", err); + ok(err==MCIERR_PARAM_OVERFLOW,"mci sysinfo without buffer returned error: %d\n", err); err = mciSendString("sysinfo waveaudio quantity open", buf, sizeof(buf), NULL); ok(!err,"mci sysinfo waveaudio quantity open returned error: %d\n", err);

1 0

Paul Chitescu : gpkcsp: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard Nov. 5, 2009

Nov. 5, 2009

Module: wine Branch: master Commit: 329fc386e0b65ea6e70fcbb80bc43b0085a4edc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329fc386e0b65ea6e70fcbb80… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:31 2009 +0200 gpkcsp: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/gpkcsp/gpkcsp.spec | 4 ++-- dlls/gpkcsp/main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gpkcsp/gpkcsp.spec b/dlls/gpkcsp/gpkcsp.spec index 1f828b0..af3cdee 100644 --- a/dlls/gpkcsp/gpkcsp.spec +++ b/dlls/gpkcsp/gpkcsp.spec @@ -22,5 +22,5 @@ @ stub CPSignHash @ stub CPVerifySignature @ stdcall DllMain(ptr long ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/gpkcsp/main.c b/dlls/gpkcsp/main.c index b6d9f17..79f1e2d 100644 --- a/dlls/gpkcsp/main.c +++ b/dlls/gpkcsp/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (GPKCSP.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (GPKCSP.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +}

1 0

Jörg Höhle : winmm/tests: Add MCI waveaudio tests .
by Alexandre Julliard Nov. 5, 2009

Nov. 5, 2009

Module: wine Branch: master Commit: 4aa5f5bc10a4b186cddc1a2802d3f5b2b396a7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa5f5bc10a4b186cddc1a280… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Oct 15 17:28:40 2009 +0200 winmm/tests: Add MCI waveaudio tests. --- dlls/winmm/tests/mci.c | 600 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 577 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4aa5f5bc10a4b186cddc1…

1 0