November 2009 - Wine-commits

Hans Leidekker : rpcrt4: Add a test for the ncalrpc protocol sequence.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 444307610ee6896c2c73c93a981f09a6d8064015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444307610ee6896c2c73c93a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 4 09:10:50 2009 +0100 rpcrt4: Add a test for the ncalrpc protocol sequence. --- dlls/rpcrt4/tests/server.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 34ef797..63614e3 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1291,6 +1291,20 @@ client(const char *test) ok(RPC_S_OK == RpcStringFree(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } + else if (strcmp(test, "ncalrpc_basic") == 0) + { + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char guid[] = "00000000-4114-0704-2301-000000000000"; + unsigned char *binding; + + ok(RPC_S_OK == RpcStringBindingCompose(NULL, ncalrpc, NULL, guid, NULL, &binding), "RpcStringBindingCompose\n"); + ok(RPC_S_OK == RpcBindingFromStringBinding(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + + run_tests(); + + ok(RPC_S_OK == RpcStringFree(&binding), "RpcStringFree\n"); + ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); + } else if (strcmp(test, "np_basic") == 0) { static unsigned char np[] = "ncacn_np"; @@ -1316,11 +1330,17 @@ server(void) static unsigned char port[] = PORT; static unsigned char np[] = "ncacn_np"; static unsigned char pipe[] = PIPE; - RPC_STATUS status, iptcp_status, np_status; + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char guid[] = "00000000-4114-0704-2301-000000000000"; + RPC_STATUS status, iptcp_status, np_status, ncalrpc_status; DWORD ret; iptcp_status = RpcServerUseProtseqEp(iptcp, 20, port, NULL); ok(iptcp_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_ip_tcp) failed with status %d\n", iptcp_status); + + ncalrpc_status = RpcServerUseProtseqEp(ncalrpc, 0, guid, NULL); + ok(ncalrpc_status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", ncalrpc_status); + np_status = RpcServerUseProtseqEp(np, 0, pipe, NULL); if (np_status == RPC_S_PROTSEQ_NOT_SUPPORTED) skip("Protocol sequence ncacn_np is not supported\n"); @@ -1347,6 +1367,11 @@ server(void) else skip("tcp_basic tests skipped due to earlier failure\n"); + if (ncalrpc_status == RPC_S_OK) + run_client("ncalrpc_basic"); + else + skip("ncalrpc_basic tests skipped due to earlier failure\n"); + if (np_status == RPC_S_OK) run_client("np_basic"); else

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10BlendState implementation.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: e3ac26d58cd985ccc670d7afb9710f7393267c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ac26d58cd985ccc670d7afb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 10:37:13 2009 +0100 d3d10core: Add a stub ID3D10BlendState implementation. --- dlls/d3d10core/d3d10core_private.h | 9 +++ dlls/d3d10core/device.c | 25 ++++++++- dlls/d3d10core/state.c | 111 ++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index e68754f..f4535ce 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -189,6 +189,15 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; +/* ID3D10BlendState */ +struct d3d10_blend_state +{ + const struct ID3D10BlendStateVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) DECLSPEC_HIDDEN; + /* ID3D10DepthStencilState */ struct d3d10_depthstencil_state { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index de623bc..b3da2ed 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -919,9 +919,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *iface, const D3D10_BLEND_DESC *desc, ID3D10BlendState **blend_state) { - FIXME("iface %p, desc %p, blend_state %p stub!\n", iface, desc, blend_state); + struct d3d10_blend_state *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 blend state object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_blend_state_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize blend state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created blend state %p.\n", object); + *blend_state = (ID3D10BlendState *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index e0468c3..2eaa652 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -26,6 +26,117 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); /* IUnknown methods */ +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10BlendState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +{ + struct d3d10_blend_state *This = (struct d3d10_blend_state *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +{ + struct d3d10_blend_state *This = (struct d3d10_blend_state *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10BlendState methods */ + +static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, + D3D10_BLEND_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = +{ + /* IUnknown methods */ + d3d10_blend_state_QueryInterface, + d3d10_blend_state_AddRef, + d3d10_blend_state_Release, + /* ID3D10DeviceChild methods */ + d3d10_blend_state_GetDevice, + d3d10_blend_state_GetPrivateData, + d3d10_blend_state_SetPrivateData, + d3d10_blend_state_SetPrivateDataInterface, + /* ID3D10BlendState methods */ + d3d10_blend_state_GetDesc, +}; + +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) +{ + state->vtbl = &d3d10_blend_state_vtbl; + state->refcount = 1; + + return S_OK; +} + +/* IUnknown methods */ + static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_QueryInterface(ID3D10DepthStencilState *iface, REFIID riid, void **object) {

1 0

Henri Verbeet : d3d10: Add a D3D10GetVertexShaderProfile() stub.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: f4f6324248543064ee4a7ca46a63c776486ff560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f6324248543064ee4a7ca46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 10:37:14 2009 +0100 d3d10: Add a D3D10GetVertexShaderProfile() stub. --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 7 +++++++ include/d3d10shader.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 0ea1d8f..332ab38 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -15,7 +15,7 @@ @ stub D3D10GetPixelShaderProfile @ stub D3D10GetShaderDebugInfo @ stub D3D10GetVersion -@ stub D3D10GetVertexShaderProfile +@ stdcall D3D10GetVertexShaderProfile(ptr) @ stub D3D10PreprocessShader @ stub D3D10ReflectShader @ stub D3D10RegisterLayers diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 5746fba..84ea2b4 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -241,3 +241,10 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return S_OK; } + +LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) +{ + FIXME("device %p stub!\n", device); + + return "vs_4_0"; +} diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 59221cc..7a0a470 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -130,4 +130,6 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC BYTE ReadWriteMask; } D3D10_SIGNATURE_PARAMETER_DESC; +LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); + #endif /* __WINE_D3D10SHADER_H */

1 0

Austin English : wined3d: Add version resource.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 5f0940e08aecf0cebb81ee1a63251a9a03499cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0940e08aecf0cebb81ee1a6… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 30 17:03:08 2009 -0500 wined3d: Add version resource. --- dlls/wined3d/Makefile.in | 2 ++ dlls/wined3d/version.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index cdafc91..88e37dd 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -44,6 +44,8 @@ C_SRCS = \ volumetexture.c \ wined3d_main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wined3d/version.rc b/dlls/wined3d/version.rc new file mode 100644 index 0000000..0439375 --- /dev/null +++ b/dlls/wined3d/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" /* Needed to get PACKAGE_VERSION */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3D" +#define WINE_FILENAME_STR "wined3d.dll" +#define WINE_FILEVERSION_STR PACKAGE_VERSION +#define WINE_PRODUCTVERSION_STR PACKAGE_VERSION +#define WINE_PRODUCTNAME_STR "Wine D3D" + +#include "wine/wine_common_ver.rc"

1 0

André Hentschel : msvcrt: Do not overlap in strcpy ( Valgrind).
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: fbe6b57b7477edfe10bb39934790ad9ba3d52846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe6b57b7477edfe10bb39934… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 1 18:59:20 2009 +0100 msvcrt: Do not overlap in strcpy (Valgrind). --- dlls/msvcrt/math.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 010e1a6..315cdcd 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -836,7 +836,7 @@ double CDECL _nextafter(double num, double next) */ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) { - int prec; + int prec, len; thread_data_t *data = msvcrt_get_thread_data(); /* FIXME: check better for overflow (native supports over 300 chars's) */ ndigits = min( ndigits, 80 - 7); /* 7 : space for dec point, 1 for "e", @@ -853,10 +853,10 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) /* handle cases with zero ndigits or less */ prec = ndigits; if( prec < 1) prec = 2; - snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); + len = snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); /* take the decimal "point away */ if( prec != 1) - strcpy( data->efcvt_buffer + 1, data->efcvt_buffer + 2); + memmove( data->efcvt_buffer + 1, data->efcvt_buffer + 2, len - 1 ); /* take the exponential "e" out */ data->efcvt_buffer[ prec] = '\0'; /* read the exponent */

1 0

Damjan Jovanovic : wiaservc: Add the class factory and IWiaDevMgr stubs.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 158f63d06a54d371082cd39af0c6317b69d41919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158f63d06a54d371082cd39af… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 31 16:06:18 2009 +0200 wiaservc: Add the class factory and IWiaDevMgr stubs. --- dlls/wiaservc/Makefile.in | 2 + dlls/wiaservc/factory.c | 103 +++++++++++++++++++++ dlls/wiaservc/service.c | 7 +- dlls/wiaservc/wiadevmgr.c | 181 ++++++++++++++++++++++++++++++++++++++ dlls/wiaservc/wiaservc_private.h | 39 ++++++++ 5 files changed, 329 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=158f63d06a54d371082cd…

1 0

Alexandre Julliard : wia: Force specifying the correct header version in Wine code.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: ab1f58864e11810e418b3f69be75481326558de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1f58864e11810e418b3f69b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 12:27:01 2009 +0100 wia: Force specifying the correct header version in Wine code. --- dlls/wiaservc/wiaservc_main.c | 2 +- include/wia.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c index 4f94275..2d30f9d 100644 --- a/dlls/wiaservc/wiaservc_main.c +++ b/dlls/wiaservc/wiaservc_main.c @@ -25,7 +25,7 @@ #include "olectl.h" #include "winsvc.h" -#include "wia.h" +#include "wia_lh.h" #include "initguid.h" #include "wine/debug.h" diff --git a/include/wia.h b/include/wia.h index 300f28a..3a0497e 100644 --- a/include/wia.h +++ b/include/wia.h @@ -17,6 +17,10 @@ */ +#ifdef __WINESRC__ +#error Specify wia_lh.h or wia_xp.h explicitly in Wine +#endif + #if (_WIN32_WINNT >= 0x0600) #include <wia_lh.h> #elif (_WIN32_WINNT >= 0x0501)

1 0

Rico Schüller : d3d10/tests: Add GetParentConstantBuffer() checks to effect variable type and class test.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: d390e6032058b36b866746091ff13d2674ce1685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d390e6032058b36b866746091… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Nov 1 13:42:49 2009 +0100 d3d10/tests: Add GetParentConstantBuffer() checks to effect variable type and class test. --- dlls/d3d10/tests/effect.c | 74 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d390e6032058b36b86674…

1 0

Rico Schüller : d3d10/tests: Add constant buffer stride test.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 216ae014ee11b7c24d5eb040eedd0556300abc00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216ae014ee11b7c24d5eb040e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Nov 1 13:42:52 2009 +0100 d3d10/tests: Add constant buffer stride test. --- dlls/d3d10/tests/effect.c | 294 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 294 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=216ae014ee11b7c24d5eb…

1 0

Juan Lang : crypt32: Add stub for CryptGetIntendedKeyUsage.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: ed701e078700919edcb37baa2e03b1a6bdcba06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed701e078700919edcb37baa2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 15:41:58 2009 -0800 crypt32: Add stub for CryptGetIntendedKeyUsage. --- dlls/crypt32/cert.c | 8 ++++++++ dlls/crypt32/crypt32.spec | 2 +- include/wincrypt.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f88cf95..cb1b973 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2197,6 +2197,14 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv, return ret; } +BOOL WINAPI CertGetIntendedKeyUsage(DWORD dwCertEncodingType, + PCERT_INFO pCertInfo, BYTE *pbKeyUsage, DWORD cbKeyUsage) +{ + FIXME("(%08x, %p, %p, %d)\n", dwCertEncodingType, pCertInfo, pbKeyUsage, + cbKeyUsage); + return FALSE; +} + BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags, PCERT_ENHKEY_USAGE pUsage, DWORD *pcbUsage) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index bcab030..ce427bd 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -57,7 +57,7 @@ @ stdcall CertGetCertificateChain(ptr ptr ptr ptr ptr long ptr ptr) @ stdcall CertGetCertificateContextProperty(ptr long ptr ptr) @ stdcall CertGetEnhancedKeyUsage(ptr long ptr ptr) -@ stub CertGetIntendedKeyUsage +@ stdcall CertGetIntendedKeyUsage(long ptr ptr long) @ stdcall CertGetIssuerCertificateFromStore(long ptr ptr ptr) @ stdcall CertGetNameStringA(ptr long long ptr ptr long) @ stdcall CertGetNameStringW(ptr long long ptr ptr long) diff --git a/include/wincrypt.h b/include/wincrypt.h index e9fbef0..32b523d 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4140,6 +4140,9 @@ BOOL WINAPI CertSerializeCRLStoreElement(PCCRL_CONTEXT pCrlContext, BOOL WINAPI CertSerializeCTLStoreElement(PCCTL_CONTEXT pCtlContext, DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement); +BOOL WINAPI CertGetIntendedKeyUsage(DWORD dwCertEncodingType, + PCERT_INFO pCertInfo, BYTE *pbKeyUsage, DWORD cbKeyUsage); + BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags, PCERT_ENHKEY_USAGE pUsage, DWORD *pcbUsage); BOOL WINAPI CertSetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext,

1 0