wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Stefan Dösinger : wined3d: Check the format block size before creating textures.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: df5a0976e9f28836489e8977122844fe053278b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5a0976e9f28836489e89771… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:12 2013 +0200 wined3d: Check the format block size before creating textures. Sizes of textures and stand-alone surfaces must be multiples of the format's block size for DXTN formats. Since we create a texture for everything (except in ddraw), this check also takes care of stand-alone surfaces. --- dlls/wined3d/texture.c | 8 ++++++++ dlls/wined3d/utils.c | 19 +++++++++++-------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 75ae8af..e60a426 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -41,6 +41,14 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc debug_d3dusage(desc->usage), debug_d3dpool(desc->pool), desc->width, desc->height, desc->depth, device, parent, parent_ops, resource_ops); + if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY)) == WINED3DFMT_FLAG_BLOCKS) + { + UINT width_mask = format->block_width - 1; + UINT height_mask = format->block_height - 1; + if (desc->width & width_mask || desc->height & height_mask) + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, desc->multisample_type, desc->multisample_quality, desc->usage, desc->pool, desc->width, desc->height, desc->depth, 0, parent, parent_ops, resource_ops))) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 61f7df0..9a56031 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -191,18 +191,19 @@ struct wined3d_format_block_info UINT block_width; UINT block_height; UINT block_byte_count; + BOOL verify; }; static const struct wined3d_format_block_info format_block_info[] = { - {WINED3DFMT_DXT1, 4, 4, 8}, - {WINED3DFMT_DXT2, 4, 4, 16}, - {WINED3DFMT_DXT3, 4, 4, 16}, - {WINED3DFMT_DXT4, 4, 4, 16}, - {WINED3DFMT_DXT5, 4, 4, 16}, - {WINED3DFMT_ATI2N, 4, 4, 16}, - {WINED3DFMT_YUY2, 2, 1, 4}, - {WINED3DFMT_UYVY, 2, 1, 4}, + {WINED3DFMT_DXT1, 4, 4, 8, TRUE}, + {WINED3DFMT_DXT2, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT3, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT4, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT5, 4, 4, 16, TRUE}, + {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, + {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, + {WINED3DFMT_UYVY, 2, 1, 4, FALSE}, }; struct wined3d_format_vertex_info @@ -1023,6 +1024,8 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) format->block_height = format_block_info[i].block_height; format->block_byte_count = format_block_info[i].block_byte_count; format->flags |= WINED3DFMT_FLAG_BLOCKS; + if (!format_block_info[i].verify) + format->flags |= WINED3DFMT_FLAG_BLOCKS_NO_VERIFY; } return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 28df2c9..5a8ced0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2916,6 +2916,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_BLOCKS 0x00020000 #define WINED3DFMT_FLAG_HEIGHT_SCALE 0x00040000 #define WINED3DFMT_FLAG_TEXTURE 0x00080000 +#define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 struct wined3d_rational {

1 0

Stefan Dösinger : wined3d: Enforce texturing capability format restrictions on resource creation.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 80638b6d2f2e9a6e71df59e2780ded768219739a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80638b6d2f2e9a6e71df59e27… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:11 2013 +0200 wined3d: Enforce texturing capability format restrictions on resource creation. --- dlls/d3d8/texture.c | 3 +++ dlls/d3d9/texture.c | 3 +++ dlls/ddraw/surface.c | 13 ++++++++++++- dlls/wined3d/resource.c | 5 ++++- include/wine/wined3d.h | 1 + 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c870612..2388267 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1197,6 +1197,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1237,6 +1238,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = edge_length; desc.height = edge_length; @@ -1276,6 +1278,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 7b46e6f..ad48205 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1321,6 +1321,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1361,6 +1362,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = edge_length; desc.height = edge_length; @@ -1400,6 +1402,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b7136e1..8627a84 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,16 +5608,27 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac layers = 1; if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + { + wined3d_desc.usage = WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_MANAGED; + } else if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + { + /* ddraw does not enforce format support restrictions on system memory + * textures. Don't set the texture flag, the texture can't be used for + * texturing anyway. */ + wined3d_desc.usage = 0; pool = WINED3D_POOL_SYSTEM_MEM; + } else + { + wined3d_desc.usage = WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_DEFAULT; + } wined3d_desc.format = wined3dformat_from_ddrawformat(&surface->surface_desc.u4.ddpfPixelFormat); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; - wined3d_desc.usage = 0; wined3d_desc.pool = pool; wined3d_desc.width = desc->dwWidth; wined3d_desc.height = desc->dwHeight; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e97af48..a677d00 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -70,7 +70,8 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_STATICDECL - | WINED3DUSAGE_OVERLAY; + | WINED3DUSAGE_OVERLAY + | WINED3DUSAGE_TEXTURE; if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); @@ -92,6 +93,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && !(format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) return WINED3DERR_INVALIDCALL; + if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags & WINED3DFMT_FLAG_TEXTURE)) + return WINED3DERR_INVALIDCALL; } resource->ref = 1; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bf4b392..423af91 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -824,6 +824,7 @@ enum wined3d_display_rotation #define WINED3DUSAGE_AUTOGENMIPMAP 0x00000400 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_MASK 0x00004fff +#define WINED3DUSAGE_TEXTURE 0x10000000 #define WINED3DUSAGE_OWNDC 0x20000000 #define WINED3DUSAGE_STATICDECL 0x40000000 #define WINED3DUSAGE_OVERLAY 0x80000000

1 0

Stefan Dösinger : ddraw: Create a sysmem surface if the format is not supported.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: b464067313bff1fd9a25b284b48a252025c4504f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b464067313bff1fd9a25b284b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:10 2013 +0200 ddraw: Create a sysmem surface if the format is not supported. --- dlls/ddraw/ddraw.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 15ab187..df4dcd6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3000,6 +3000,27 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, ddrawformat_from_wined3dformat(&desc2.u4.ddpfPixelFormat, mode.format_id); } + if (!(desc2.ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + && !(desc2.ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)) + { + enum wined3d_format_id format = wined3dformat_from_ddrawformat(&desc2.u4.ddpfPixelFormat); + enum wined3d_resource_type rtype; + + if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + rtype = WINED3D_RTYPE_TEXTURE; + else if (desc2.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + rtype = WINED3D_RTYPE_CUBE_TEXTURE; + else + rtype = WINED3D_RTYPE_SURFACE; + + hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, + mode.format_id, 0, rtype, format); + if (SUCCEEDED(hr)) + desc2.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; + else + desc2.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + } + /* No Width or no Height? Use the original screen size */ if(!(desc2.dwFlags & DDSD_WIDTH) ||

1 0

Jacek Caban : crypt32: Added support for retrieving certs by URL.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: ba4278a73502916f002e2e81100659f8f632dbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4278a73502916f002e2e811… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 6 13:09:11 2013 +0200 crypt32: Added support for retrieving certs by URL. --- dlls/crypt32/chain.c | 38 +++++++++++++++++++------------------- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index bbd0aca..1a83dee 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1972,7 +1972,7 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, } static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, const CERT_CONTEXT *cert, - HCERTSTORE store, DWORD type, void *para, PCCERT_CONTEXT prev_issuer) + HCERTSTORE store, DWORD type, void *para, DWORD flags, PCCERT_CONTEXT prev_issuer) { CRYPT_URL_ARRAY *urls; PCCERT_CONTEXT issuer; @@ -2019,7 +2019,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con TRACE("Trying URL %s\n", debugstr_w(urls->rgwszUrl[i])); res = CryptRetrieveObjectByUrlW(urls->rgwszUrl[i], CONTEXT_OID_CERTIFICATE, - CRYPT_CACHE_ONLY_RETRIEVAL /* FIXME */, + (flags & CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL) ? CRYPT_CACHE_ONLY_RETRIEVAL : CRYPT_AIA_RETRIEVAL, 0, (void**)&new_cert, NULL, NULL, NULL, NULL); if(!res) { @@ -2047,7 +2047,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, HCERTSTORE store, PCCERT_CONTEXT subject, PCCERT_CONTEXT prevIssuer, - DWORD *infoStatus) + DWORD flags, DWORD *infoStatus) { PCCERT_CONTEXT issuer = NULL; PCERT_EXTENSION ext; @@ -2076,7 +2076,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, memcpy(&id.u.IssuerSerialNumber.SerialNumber, &info->CertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by issuer/serial number\n"); @@ -2088,7 +2088,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2133,7 +2133,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, &info->AuthorityCertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by directory name\n"); @@ -2147,7 +2147,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, { id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, flags, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2160,7 +2160,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, else { issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_SUBJECT_NAME, - &subject->pCertInfo->Issuer, prevIssuer); + &subject->pCertInfo->Issuer, flags, prevIssuer); TRACE_(chain)("issuer found by name\n"); *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; } @@ -2171,7 +2171,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, * until reaching a self-signed cert, or until no issuer can be found. */ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, - HCERTSTORE world, PCERT_SIMPLE_CHAIN chain) + HCERTSTORE world, DWORD flags, PCERT_SIMPLE_CHAIN chain) { BOOL ret = TRUE; PCCERT_CONTEXT cert = chain->rgpElement[chain->cElement - 1]->pCertContext; @@ -2179,7 +2179,7 @@ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - PCCERT_CONTEXT issuer = CRYPT_GetIssuer(engine, world, cert, NULL, + PCCERT_CONTEXT issuer = CRYPT_GetIssuer(engine, world, cert, NULL, flags, &chain->rgpElement[chain->cElement - 1]->TrustStatus.dwInfoStatus); if (issuer) @@ -2210,7 +2210,7 @@ static LPCSTR debugstr_filetime(LPFILETIME pTime) } static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, - HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, + HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, DWORD flags, PCERT_SIMPLE_CHAIN *ppChain) { BOOL ret = FALSE; @@ -2226,7 +2226,7 @@ static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, ret = CRYPT_AddCertToSimpleChain(engine, chain, cert, 0); if (ret) { - ret = CRYPT_BuildSimpleChain(engine, world, chain); + ret = CRYPT_BuildSimpleChain(engine, world, flags, chain); if (ret) CRYPT_CheckSimpleChain(engine, chain, pTime); } @@ -2241,7 +2241,7 @@ static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, } static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, - PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, DWORD flags, CertificateChain **ppChain) { PCERT_SIMPLE_CHAIN simpleChain = NULL; @@ -2256,7 +2256,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, /* FIXME: only simple chains are supported for now, as CTLs aren't * supported yet. */ - if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, &simpleChain))) + if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, flags, &simpleChain))) { CertificateChain *chain = CryptMemAlloc(sizeof(CertificateChain)); @@ -2430,7 +2430,7 @@ static CertificateChain *CRYPT_CopyChainToElement(CertificateChain *chain, static CertificateChain *CRYPT_BuildAlternateContextFromChain( CertificateChainEngine *engine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, - CertificateChain *chain) + DWORD flags, CertificateChain *chain) { CertificateChain *alternate; @@ -2462,7 +2462,7 @@ static CertificateChain *CRYPT_BuildAlternateContextFromChain( chain->context.rgpChain[i]->rgpElement[j + 1]->pCertContext); alternateIssuer = CRYPT_GetIssuer(engine, prevIssuer->hCertStore, - subject, prevIssuer, &infoStatus); + subject, prevIssuer, flags, &infoStatus); } if (alternateIssuer) { @@ -2481,7 +2481,7 @@ static CertificateChain *CRYPT_BuildAlternateContextFromChain( if (ret) { ret = CRYPT_BuildSimpleChain(engine, alternate->world, - alternate->context.rgpChain[i]); + flags, alternate->context.rgpChain[i]); if (ret) CRYPT_CheckSimpleChain(engine, alternate->context.rgpChain[i], pTime); @@ -2892,7 +2892,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, dump_chain_para(pChainPara); /* FIXME: what about HCCE_LOCAL_MACHINE? */ ret = CRYPT_BuildCandidateChainFromCert(engine, pCertContext, pTime, - hAdditionalStore, &chain); + hAdditionalStore, dwFlags, &chain); if (ret) { CertificateChain *alternate = NULL; @@ -2900,7 +2900,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, do { alternate = CRYPT_BuildAlternateContextFromChain(engine, - pTime, hAdditionalStore, chain); + pTime, hAdditionalStore, dwFlags, chain); /* Alternate contexts are added as "lower quality" contexts of * chain, to avoid loops in alternate chain creation. diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 96eafa2..ec53539 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3998,7 +3998,7 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); if(chain->TrustStatus.dwErrorStatus == CERT_TRUST_IS_PARTIAL_CHAIN) { /* win2k */ - todo_wine win_skip("winehq cert reported as partial chain, skipping its tests\n"); + win_skip("winehq cert reported as partial chain, skipping its tests\n"); pCertFreeCertificateChain(chain); CertCloseStore(store, 0); return;

1 0

Jacek Caban : crypt32: Added support for retrieving issuers from URL cache.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 9dd32ba67dbb3918b3cdb3f1baf23a85c134aa40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd32ba67dbb3918b3cdb3f1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 6 13:08:59 2013 +0200 crypt32: Added support for retrieving issuers from URL cache. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/chain.c | 48 +++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/chain.c | 2 + 3 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 9c85a47..f84ecf4 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -D_CRYPT32_ MODULE = crypt32.dll IMPORTLIB = crypt32 IMPORTS = user32 advapi32 +DELAYIMPORTS = cryptnet EXTRALIBS = @SECURITYLIB@ C_SRCS = \ diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 4a8933b..bbd0aca 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1974,7 +1974,10 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, const CERT_CONTEXT *cert, HCERTSTORE store, DWORD type, void *para, PCCERT_CONTEXT prev_issuer) { + CRYPT_URL_ARRAY *urls; PCCERT_CONTEXT issuer; + DWORD size; + BOOL res; issuer = CertFindCertificateInStore(store, cert->dwCertEncodingType, 0, type, para, prev_issuer); if(issuer) { @@ -1996,7 +1999,50 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con } } - return NULL; + res = CryptGetObjectUrl(URL_OID_CERTIFICATE_ISSUER, (void*)cert, 0, NULL, &size, NULL, NULL, NULL); + if(!res) + return NULL; + + urls = HeapAlloc(GetProcessHeap(), 0, size); + if(!urls) + return NULL; + + res = CryptGetObjectUrl(URL_OID_CERTIFICATE_ISSUER, (void*)cert, 0, urls, &size, NULL, NULL, NULL); + if(res) + { + CERT_CONTEXT *new_cert; + HCERTSTORE new_store; + unsigned i; + + for(i=0; i < urls->cUrl; i++) + { + TRACE("Trying URL %s\n", debugstr_w(urls->rgwszUrl[i])); + + res = CryptRetrieveObjectByUrlW(urls->rgwszUrl[i], CONTEXT_OID_CERTIFICATE, + CRYPT_CACHE_ONLY_RETRIEVAL /* FIXME */, + 0, (void**)&new_cert, NULL, NULL, NULL, NULL); + if(!res) + { + TRACE("CryptRetrieveObjectByUrlW failed: %u\n", GetLastError()); + continue; + } + + /* FIXME: Use new_cert->hCertStore once cert ref count bug is fixed. */ + new_store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + CertAddCertificateContextToStore(new_store, new_cert, CERT_STORE_ADD_NEW, NULL); + issuer = CertFindCertificateInStore(new_store, cert->dwCertEncodingType, 0, type, para, NULL); + CertFreeCertificateContext(new_cert); + CertCloseStore(new_store, 0); + if(issuer) + { + TRACE("Found downloaded issuer %p\n", issuer); + break; + } + } + } + + HeapFree(GetProcessHeap(), 0, urls); + return issuer; } static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a89c636..96eafa2 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4005,6 +4005,7 @@ static void testGetCertChain(void) } ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + todo_wine ok(chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, "chain->TrustStatus.dwInfoStatus = %x\n", chain->TrustStatus.dwInfoStatus); @@ -4016,6 +4017,7 @@ static void testGetCertChain(void) ok(simple_chain->cbSize == sizeof(*simple_chain), "simple_chain->cbSize = %u\n", simple_chain->cbSize); ok(!simple_chain->TrustStatus.dwErrorStatus, "simple_chain->TrustStatus.dwErrorStatus = %x\n", simple_chain->TrustStatus.dwErrorStatus); + todo_wine ok(simple_chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, "simple_chain->TrustStatus.dwInfoStatus = %x\n", simple_chain->TrustStatus.dwInfoStatus); ok(simple_chain->cElement == 3, "simple_chain->cElement = %u\n", simple_chain->cElement);

1 0

Jacek Caban : crypt32: Search world collection when looking for issuer.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 0e0d51ae85ee21d03654fbd06e083bbe4509a9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0d51ae85ee21d03654fbd06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 6 13:08:49 2013 +0200 crypt32: Search world collection when looking for issuer. --- dlls/crypt32/chain.c | 62 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index fbfe3a5..4a8933b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1971,8 +1971,37 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, CRYPT_CombineTrustStatus(&chain->TrustStatus, &rootElement->TrustStatus); } -static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, - PCCERT_CONTEXT prevIssuer, DWORD *infoStatus) +static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, const CERT_CONTEXT *cert, + HCERTSTORE store, DWORD type, void *para, PCCERT_CONTEXT prev_issuer) +{ + PCCERT_CONTEXT issuer; + + issuer = CertFindCertificateInStore(store, cert->dwCertEncodingType, 0, type, para, prev_issuer); + if(issuer) { + TRACE("Found in store %p\n", issuer); + return issuer; + } + + /* FIXME: For alternate issuers, we don't search world store nor try to retrieve issuer from URL. + * This needs more tests. + */ + if(prev_issuer) + return NULL; + + if(engine->hWorld) { + issuer = CertFindCertificateInStore(engine->hWorld, cert->dwCertEncodingType, 0, type, para, NULL); + if(issuer) { + TRACE("Found in world %p\n", issuer); + return issuer; + } + } + + return NULL; +} + +static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, + HCERTSTORE store, PCCERT_CONTEXT subject, PCCERT_CONTEXT prevIssuer, + DWORD *infoStatus) { PCCERT_CONTEXT issuer = NULL; PCERT_EXTENSION ext; @@ -2000,9 +2029,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, sizeof(CERT_NAME_BLOB)); memcpy(&id.u.IssuerSerialNumber.SerialNumber, &info->CertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, - prevIssuer); + + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by issuer/serial number\n"); @@ -2012,10 +2040,9 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, else if (info->KeyId.cbData) { id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, - prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2059,9 +2086,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, memcpy(&id.u.IssuerSerialNumber.SerialNumber, &info->AuthorityCertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, - prevIssuer); + + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by directory name\n"); @@ -2075,9 +2101,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, { id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, - prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2089,8 +2113,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, } else { - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_SUBJECT_NAME, + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_SUBJECT_NAME, &subject->pCertInfo->Issuer, prevIssuer); TRACE_(chain)("issuer found by name\n"); *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; @@ -2110,7 +2133,7 @@ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - PCCERT_CONTEXT issuer = CRYPT_GetIssuer(world, cert, NULL, + PCCERT_CONTEXT issuer = CRYPT_GetIssuer(engine, world, cert, NULL, &chain->rgpElement[chain->cElement - 1]->TrustStatus.dwInfoStatus); if (issuer) @@ -2187,8 +2210,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, /* FIXME: only simple chains are supported for now, as CTLs aren't * supported yet. */ - if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, - &simpleChain))) + if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, &simpleChain))) { CertificateChain *chain = CryptMemAlloc(sizeof(CertificateChain)); @@ -2393,7 +2415,7 @@ static CertificateChain *CRYPT_BuildAlternateContextFromChain( PCCERT_CONTEXT prevIssuer = CertDuplicateCertificateContext( chain->context.rgpChain[i]->rgpElement[j + 1]->pCertContext); - alternateIssuer = CRYPT_GetIssuer(prevIssuer->hCertStore, + alternateIssuer = CRYPT_GetIssuer(engine, prevIssuer->hCertStore, subject, prevIssuer, &infoStatus); } if (alternateIssuer)

1 0

Nikolay Sivov : user32/tests: Test to show that SendMessage/PostMessage don 't force caller activation context on window thread.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 47650c3320ae18440cad402c125c203b4cf54319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47650c3320ae18440cad402c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 6 14:48:56 2013 +0400 user32/tests: Test to show that SendMessage/PostMessage don't force caller activation context on window thread. --- dlls/user32/tests/msg.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3a857e8..87e2817 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -60,6 +60,20 @@ #define WM_LBTRACKPOINT 0x0131 #endif +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#else +#define ARCH "none" +#endif + +static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); +static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); +static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); +static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static void (WINAPI *pReleaseActCtx)(HANDLE); + /* encoded DRAWITEMSTRUCT into an LPARAM */ typedef struct { @@ -6728,9 +6742,66 @@ static DWORD CALLBACK create_child_thread( void *param ) return 0; } +static const char manifest_dep[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"testdep1\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" +" <file name=\"testdep.dll\" />" +"</assembly>"; + +static const char manifest_main[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\" />" +"<dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"testdep1\" version=\"1.2.3.4\" processorArchitecture=\"" ARCH "\" />" +" </dependentAssembly>" +"</dependency>" +"</assembly>"; + +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static HANDLE test_create(const char *file) +{ + WCHAR path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + handle = pCreateActCtxW(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} + static void test_interthread_messages(void) { - HANDLE hThread; + HANDLE hThread, context, handle, event; + ULONG_PTR cookie; DWORD tid; WNDPROC proc; MSG msg; @@ -6828,6 +6899,60 @@ static void test_interthread_messages(void) ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); log_all_parent_messages--; DestroyWindow( wnd_event.hwnd ); + + /* activation context tests */ + if (!pActivateActCtx) + { + win_skip("Activation contexts are not supported, skipping\n"); + return; + } + + create_manifest_file("testdep1.manifest", manifest_dep); + create_manifest_file("main.manifest", manifest_main); + + context = test_create("main.manifest"); + DeleteFileA("testdep1.manifest"); + DeleteFileA("main.manifest"); + + handle = (void*)0xdeadbeef; + ret = pGetCurrentActCtx(&handle); + ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(handle == 0, "active context %p\n", handle); + + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + /* context is activated after thread creation, so it doesn't inherit it by default */ + ret = pActivateActCtx(context, &cookie); + ok(ret, "activation failed: %u\n", GetLastError()); + + handle = 0; + ret = pGetCurrentActCtx(&handle); + ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(handle != 0, "active context %p\n", handle); + + /* destination window will test for active context */ + ret = SendMessageA(wnd_event.hwnd, WM_USER+10, 0, 0); + ok(ret, "thread window returned %d\n", ret); + + event = CreateEventW(NULL, 0, 0, NULL); + ret = PostMessageA(wnd_event.hwnd, WM_USER+10, 0, (LPARAM)event); + ok(ret, "thread window returned %d\n", ret); + ok(WaitForSingleObject(event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(event); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hThread); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); + pReleaseActCtx(context); } @@ -7463,6 +7588,19 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, case WM_NCHITTEST: return HTCLIENT; + case WM_USER+10: + { + HANDLE handle, event = (HANDLE)lParam; + BOOL ret; + + handle = (void*)0xdeadbeef; + ret = pGetCurrentActCtx(&handle); + ok(ret, "failed to get current context, %u\n", GetLastError()); + ok(handle == 0, "got active context %p\n", handle); + if (event) SetEvent(event); + return 1; + } + /* ignore */ case WM_MOUSEMOVE: case WM_MOUSEACTIVATE: @@ -14105,6 +14243,19 @@ static void test_layered_window(void) DeleteObject( bmp ); } +static void init_funcs(void) +{ + HMODULE hKernel32 = GetModuleHandle("kernel32"); + +#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) + X(ActivateActCtx); + X(CreateActCtxW); + X(DeactivateActCtx); + X(GetCurrentActCtx); + X(ReleaseActCtx); +#undef X +} + START_TEST(msg) { char **test_argv; @@ -14112,8 +14263,11 @@ START_TEST(msg) BOOL (WINAPI *pIsWinEventHookInstalled)(DWORD)= 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ HMODULE hModuleImm32; BOOL (WINAPI *pImmDisableIME)(DWORD); + int argc; + + init_funcs(); - int argc = winetest_get_mainargs( &test_argv ); + argc = winetest_get_mainargs( &test_argv ); if (argc >= 3) { unsigned int arg;

1 0

Andrew Cook : kernel32: Fix argument order for NtIsProcessInJob.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: fef18a42670cd97df214512556ffb090d36e3d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef18a42670cd97df21451255… Author: Andrew Cook <ariscop(a)gmail.com> Date: Fri Sep 6 16:13:12 2013 +1000 kernel32: Fix argument order for NtIsProcessInJob. --- dlls/kernel32/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 5cb8e3f..a0ccbb6 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1015,7 +1015,7 @@ BOOL WINAPI AssignProcessToJobObject( HANDLE job, HANDLE process ) */ BOOL WINAPI IsProcessInJob( HANDLE process, HANDLE job, PBOOL result ) { - NTSTATUS status = NtIsProcessInJob( job, process ); + NTSTATUS status = NtIsProcessInJob( process, job ); switch(status) { case STATUS_PROCESS_IN_JOB:

1 0

Dmitry Timoshkov : ntdll/tests: Add some tests for negative file offsets.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: a4ec0593547920a9bb13b799d3f3795278efba01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ec0593547920a9bb13b799d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 6 17:03:03 2013 +0900 ntdll/tests: Add some tests for negative file offsets. --- dlls/ntdll/tests/file.c | 181 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 168 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4ec0593547920a9bb13b…

1 0

Henri Verbeet : d3drm: Avoid LPCSTR.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 75deeb458989e01c6c83496c4519d7962d44ea7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75deeb458989e01c6c83496c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:43 2013 +0200 d3drm: Avoid LPCSTR. --- dlls/d3drm/d3drm.c | 36 +++++++-------------- dlls/d3drm/device.c | 18 ++++------- dlls/d3drm/face.c | 12 ++----- dlls/d3drm/frame.c | 22 +++++-------- dlls/d3drm/light.c | 6 +-- dlls/d3drm/material.c | 4 +- dlls/d3drm/meshbuilder.c | 27 +++++++---------- dlls/d3drm/texture.c | 26 +++++++-------- dlls/d3drm/viewport.c | 12 ++----- include/d3drm.h | 12 ++++---- include/d3drmdef.h | 7 ++-- include/d3drmobj.h | 76 +++++++++++++++++++++++----------------------- include/d3drmwin.h | 2 +- 13 files changed, 110 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75deeb458989e01c6c834…

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013