October 2013 - Wine-Commits

Jacek Caban : crypt32: Get rid of no longer needed hCertStore checks.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 217e0119d92bb701e9a140ad4c42a6d9b7f4cb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=217e0119d92bb701e9a140ad4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 21 15:59:11 2013 +0200 crypt32: Get rid of no longer needed hCertStore checks. --- dlls/crypt32/cert.c | 10 +--------- dlls/crypt32/crl.c | 9 +-------- dlls/crypt32/ctl.c | 32 ++++++++++---------------------- dlls/crypt32/store.c | 40 ++++++++++++++-------------------------- 4 files changed, 26 insertions(+), 65 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f23629b..1858a1b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -555,15 +555,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = FALSE; break; case CERT_ACCESS_STATE_PROP_ID: - if (pCertContext->hCertStore) - ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId, - pvData, pcbData); - else - { - DWORD state = 0; - - ret = CertContext_CopyParam(pvData, pcbData, &state, sizeof(state)); - } + ret = CertGetStoreProperty(cert->ctx.hCertStore, dwPropId, pvData, pcbData); break; case CERT_KEY_PROV_HANDLE_PROP_ID: { diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 07e86b2..db80651 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -499,14 +499,7 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext, } else { - if (pCRLContext->hCertStore) - ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, - pvData, pcbData); - else - { - *(DWORD *)pvData = 0; - ret = TRUE; - } + ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, pvData, pcbData); } break; default: diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 6893e2d..fa98556 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -341,26 +341,21 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore(HCERTSTORE hCertStore, BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) { + WINECRYPT_CERTSTORE *hcs = pCtlContext->hCertStore; + ctl_t *ctl = ctl_from_ptr(pCtlContext); BOOL ret; TRACE("(%p)\n", pCtlContext); if (!pCtlContext) - ret = TRUE; - else if (!pCtlContext->hCertStore) - ret = CertFreeCTLContext(pCtlContext); - else - { - WINECRYPT_CERTSTORE *hcs = pCtlContext->hCertStore; - ctl_t *ctl = ctl_from_ptr(pCtlContext); + return TRUE; - if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) - ret = FALSE; - else - ret = hcs->vtbl->ctls.delete(hcs, &ctl->base); - if (ret) - ret = CertFreeCTLContext(pCtlContext); - } + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + + ret = hcs->vtbl->ctls.delete(hcs, &ctl->base); + if (ret) + ret = CertFreeCTLContext(pCtlContext); return ret; } @@ -621,14 +616,7 @@ BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, } else { - if (pCTLContext->hCertStore) - ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, - pvData, pcbData); - else - { - *(DWORD *)pvData = 0; - ret = TRUE; - } + ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, pvData, pcbData); } break; default: diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 7e22b95..6c34e55 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -949,24 +949,17 @@ PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore, PCCERT_ BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext) { - BOOL ret; + WINECRYPT_CERTSTORE *hcs = pCertContext->hCertStore; TRACE("(%p)\n", pCertContext); if (!pCertContext) - ret = TRUE; - else if (!pCertContext->hCertStore) - ret = CertFreeCertificateContext(pCertContext); - else - { - WINECRYPT_CERTSTORE *hcs = pCertContext->hCertStore; + return TRUE; - if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) - ret = FALSE; - else - ret = hcs->vtbl->certs.delete(hcs, &cert_from_ptr(pCertContext)->base); - } - return ret; + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + + return hcs->vtbl->certs.delete(hcs, &cert_from_ptr(pCertContext)->base); } BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, @@ -1091,25 +1084,20 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext) { + WINECRYPT_CERTSTORE *hcs = pCrlContext->hCertStore; BOOL ret; TRACE("(%p)\n", pCrlContext); if (!pCrlContext) - ret = TRUE; - else if (!pCrlContext->hCertStore) - ret = CertFreeCRLContext(pCrlContext); - else - { - WINECRYPT_CERTSTORE *hcs = pCrlContext->hCertStore; + return TRUE; - if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) - ret = FALSE; - else - ret = hcs->vtbl->crls.delete(hcs, &crl_from_ptr(pCrlContext)->base); - if (ret) - ret = CertFreeCRLContext(pCrlContext); - } + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + + ret = hcs->vtbl->crls.delete(hcs, &crl_from_ptr(pCrlContext)->base); + if (ret) + ret = CertFreeCRLContext(pCrlContext); return ret; }

1 0

Jacek Caban : crypt32: Get rid of no longer needed contextInterface arguments.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 9a4401afcb6d1fa7018d0ea1015d63be26e47c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4401afcb6d1fa7018d0ea10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 21 15:59:55 2013 +0200 crypt32: Get rid of no longer needed contextInterface arguments. --- dlls/crypt32/collectionstore.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 6abcef0..bfb83d1 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -148,7 +148,7 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, */ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, WINE_STORE_LIST_ENTRY *storeEntry, const CONTEXT_FUNCS *contextFuncs, - const WINE_CONTEXT_INTERFACE *contextInterface, context_t *prev) + context_t *prev) { context_t *child, *ret; struct list *storeNext = list_next(&store->stores, &storeEntry->entry); @@ -188,7 +188,7 @@ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, (CONTEXT_FUNCS*)((LPBYTE)storeNextEntry->store->vtbl + offset); ret = CRYPT_CollectionAdvanceEnum(store, storeNextEntry, - storeNextContexts, contextInterface, NULL); + storeNextContexts, NULL); } else { @@ -235,7 +235,7 @@ static context_t *Collection_enumCert(WINECRYPT_CERTSTORE *store, context_t *pre WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->certs, pCertInterface, prev); + &storeEntry->store->vtbl->certs, prev); } else { @@ -245,7 +245,7 @@ static context_t *Collection_enumCert(WINECRYPT_CERTSTORE *store, context_t *pre WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->certs, pCertInterface, NULL); + &storeEntry->store->vtbl->certs, NULL); } else { @@ -304,7 +304,7 @@ static context_t *Collection_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->crls, pCRLInterface, prev); + &storeEntry->store->vtbl->crls, prev); } else { @@ -314,7 +314,7 @@ static context_t *Collection_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->crls, pCRLInterface, NULL); + &storeEntry->store->vtbl->crls, NULL); } else { @@ -372,7 +372,7 @@ static context_t *Collection_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->ctls, pCTLInterface, prev); + &storeEntry->store->vtbl->ctls, prev); } else { @@ -382,7 +382,7 @@ static context_t *Collection_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->ctls, pCTLInterface, NULL); + &storeEntry->store->vtbl->ctls, NULL); } else {

1 0

Akihiro Sagawa : gdi32/tests: Add tests for fake bold outline fonts.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: b6666014c5ed694d5e37e517171336e52be81ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6666014c5ed694d5e37e5171… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Oct 17 21:25:06 2013 +0900 gdi32/tests: Add tests for fake bold outline fonts. --- dlls/gdi32/tests/font.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 94d9659..854d68b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5645,6 +5645,65 @@ static void test_GetCharWidth32(void) DeleteObject(hfont); } +static void test_fake_bold_font(void) +{ + HDC hdc; + HFONT hfont, hfont_old; + LOGFONTA lf; + BOOL ret; + TEXTMETRICA tm[2]; + ABC abc[2]; + INT w[2]; + + if (!pGetCharWidth32A || !pGetCharABCWidthsA) { + win_skip("GetCharWidth32A/GetCharABCWidthA is not available on this platform\n"); + return; + } + + /* Test outline font */ + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Wingdings"); + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = SYMBOL_CHARSET; + hfont = CreateFontIndirectA(&lf); + + hdc = GetDC(NULL); + hfont_old = SelectObject(hdc, hfont); + + /* base metrics */ + ret = GetTextMetricsA(hdc, &tm[0]); + ok(ret, "got %d\n", ret); + ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &abc[0]); + ok(ret, "got %d\n", ret); + + lf.lfWeight = FW_BOLD; + hfont = CreateFontIndirectA(&lf); + DeleteObject(SelectObject(hdc, hfont)); + + /* bold metrics */ + ret = GetTextMetricsA(hdc, &tm[1]); + ok(ret, "got %d\n", ret); + ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &abc[1]); + ok(ret, "got %d\n", ret); + + DeleteObject(SelectObject(hdc, hfont_old)); + ReleaseDC(NULL, hdc); + + /* compare results (outline) */ + ok(tm[0].tmHeight == tm[1].tmHeight, "expected %d, got %d\n", tm[0].tmHeight, tm[1].tmHeight); + ok(tm[0].tmAscent == tm[1].tmAscent, "expected %d, got %d\n", tm[0].tmAscent, tm[1].tmAscent); + ok(tm[0].tmDescent == tm[1].tmDescent, "expected %d, got %d\n", tm[0].tmDescent, tm[1].tmDescent); + todo_wine ok((tm[0].tmAveCharWidth + 1) == tm[1].tmAveCharWidth, + "expected %d, got %d\n", tm[0].tmAveCharWidth + 1, tm[1].tmAveCharWidth); + todo_wine ok((tm[0].tmMaxCharWidth + 1) == tm[1].tmMaxCharWidth, + "expected %d, got %d\n", tm[0].tmMaxCharWidth + 1, tm[1].tmMaxCharWidth); + ok(tm[0].tmOverhang == tm[1].tmOverhang, "expected %d, got %d\n", tm[0].tmOverhang, tm[1].tmOverhang); + w[0] = abc[0].abcA + abc[0].abcB + abc[0].abcC; + w[1] = abc[1].abcA + abc[1].abcB + abc[1].abcC; + todo_wine ok((w[0] + 1) == w[1], "expected %d, got %d\n", w[0] + 1, w[1]); + +} + START_TEST(font) { init(); @@ -5704,6 +5763,7 @@ START_TEST(font) test_max_height(); test_vertical_order(); test_GetCharWidth32(); + test_fake_bold_font(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Dmitry Timoshkov : kernel32/tests: Fix heap tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: e02774ad40775b57e82b8dc2a0aa829b021275b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02774ad40775b57e82b8dc2a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:03 2013 +0900 kernel32/tests: Fix heap tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e36336c..4a730c7 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -534,7 +534,7 @@ static void test_HeapQueryInformation(void) SIZE_T size; BOOL ret; - pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "HeapQueryInformation"); + pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "HeapQueryInformation"); if (!pHeapQueryInformation) { win_skip("HeapQueryInformation is not available\n");

1 0

Jacek Caban : secur32: Cache certificate context instead of store in schannel handle.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 4d97b3232310d8a71610a5c97b9738fbad8b5482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d97b3232310d8a71610a5c97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 21 15:57:54 2013 +0200 secur32: Cache certificate context instead of store in schannel handle. --- dlls/secur32/schannel.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 240062f..5b86a75 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -57,7 +57,7 @@ struct schan_context { schan_imp_session session; ULONG req_ctx_attr; - HCERTSTORE cert_store; + const CERT_CONTEXT *cert; }; static struct schan_handle *schan_handle_table; @@ -810,7 +810,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx = HeapAlloc(GetProcessHeap(), 0, sizeof(*ctx)); if (!ctx) return SEC_E_INSUFFICIENT_MEMORY; - ctx->cert_store = NULL; + ctx->cert = NULL; handle = schan_alloc_handle(ctx, SCHAN_HANDLE_CTX); if (handle == SCHAN_INVALID_HANDLE) { @@ -987,13 +987,22 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( { PCCERT_CONTEXT *cert = buffer; - if (!ctx->cert_store) { - ctx->cert_store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - if(!ctx->cert_store) + if (!ctx->cert) { + HCERTSTORE cert_store; + SECURITY_STATUS status; + + cert_store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + if(!cert_store) return GetLastError(); + + status = schan_imp_get_session_peer_certificate(ctx->session, cert_store, &ctx->cert); + CertCloseStore(cert_store, 0); + if(status != SEC_E_OK) + return status; } - return schan_imp_get_session_peer_certificate(ctx->session, ctx->cert_store, cert); + *cert = CertDuplicateCertificateContext(ctx->cert); + return SEC_E_OK; } case SECPKG_ATTR_CONNECTION_INFO: { @@ -1301,8 +1310,8 @@ static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context ctx = schan_free_handle(context_handle->dwLower, SCHAN_HANDLE_CTX); if (!ctx) return SEC_E_INVALID_HANDLE; - if (ctx->cert_store) - CertCloseStore(ctx->cert_store, 0); + if (ctx->cert) + CertFreeCertificateContext(ctx->cert); schan_imp_dispose_session(ctx->session); HeapFree(GetProcessHeap(), 0, ctx);

1 0

Nikolay Sivov : ole32: Support registration-free COM in CoGetClassObject().
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: af93b530828bc9bca78a137c734837f72aa7bd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af93b530828bc9bca78a137c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 08:47:15 2013 +0400 ole32: Support registration-free COM in CoGetClassObject(). --- dlls/ole32/compobj.c | 198 ++++++++++++++++++++++++++++++++++---------- dlls/ole32/tests/compobj.c | 61 +++++++++++++- 2 files changed, 213 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af93b530828bc9bca78a1…

1 0

Akihiro Sagawa : gdi32: Synthesize bold glyphs for outline fonts.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 99ceb599bb055abb461680bf7a7ae295fe724ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ceb599bb055abb461680bf7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Oct 17 21:25:10 2013 +0900 gdi32: Synthesize bold glyphs for outline fonts. --- dlls/gdi32/freetype.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 45723d3..fb4f2af 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -175,6 +175,7 @@ MAKE_FUNCPTR(FT_MulFix); MAKE_FUNCPTR(FT_New_Face); MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FT_Outline_Get_Bitmap); +MAKE_FUNCPTR(FT_Outline_Get_CBox); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); MAKE_FUNCPTR(FT_Render_Glyph); @@ -183,6 +184,7 @@ MAKE_FUNCPTR(FT_Set_Charmap); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); MAKE_FUNCPTR(FT_Vector_Transform); MAKE_FUNCPTR(FT_Vector_Unit); +static FT_Error (*pFT_Outline_Embolden)(FT_Outline *, FT_Pos); static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); #ifdef HAVE_FREETYPE_FTLCDFIL_H static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); @@ -3903,6 +3905,7 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_New_Face) LOAD_FUNCPTR(FT_New_Memory_Face) LOAD_FUNCPTR(FT_Outline_Get_Bitmap) + LOAD_FUNCPTR(FT_Outline_Get_CBox) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) LOAD_FUNCPTR(FT_Render_Glyph) @@ -3913,6 +3916,7 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Vector_Unit) #undef LOAD_FUNCPTR /* Don't warn if these ones are missing */ + pFT_Outline_Embolden = wine_dlsym(ft_handle, "FT_Outline_Embolden", NULL, 0); pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0); #ifdef HAVE_FREETYPE_FTLCDFIL_H pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); @@ -6106,6 +6110,44 @@ static inline BOOL is_identity_MAT2(const MAT2 *matrix) return !memcmp(matrix, &identity, sizeof(MAT2)); } +static void synthesize_bold_glyph(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) +{ + FT_Error err; + static UINT once; + + switch(glyph->format) { + case FT_GLYPH_FORMAT_OUTLINE: + { + FT_Pos strength; + FT_BBox bbox; + if(!pFT_Outline_Embolden) + break; + + strength = MulDiv(ppem, 1 << 6, 24); + err = pFT_Outline_Embolden(&glyph->outline, strength); + if(err) { + TRACE("FT_Ouline_Embolden returns %d, ignored\n", err); + break; + } + + pFT_Outline_Get_CBox(&glyph->outline, &bbox); + metrics->width = bbox.xMax - bbox.xMin; + metrics->height = bbox.yMax - bbox.yMin; + metrics->horiBearingX = bbox.xMin; + metrics->horiBearingY = bbox.yMax; + metrics->horiAdvance += (1 << 6); + metrics->vertAdvance += (1 << 6); + metrics->vertBearingX = metrics->horiBearingX - metrics->horiAdvance / 2; + metrics->vertBearingY = (metrics->vertAdvance - metrics->height) / 2; + break; + } + default: + if (!once++) + WARN("Emboldening format 0x%x is not supported\n", glyph->format); + return; + } +} + static inline BYTE get_max_level( UINT format ) { switch( format ) @@ -6370,10 +6412,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } + metrics = ft_face->glyph->metrics; + if(font->fake_bold) + synthesize_bold_glyph(ft_face->glyph, font->ppem, &metrics); + /* Some poorly-created fonts contain glyphs that exceed the boundaries set * by the text metrics. The proper behavior is to clip the glyph metrics to * fit within the maximums specified in the text metrics. */ - metrics = ft_face->glyph->metrics; if(incoming_font->potm || get_outline_text_metrics(incoming_font) || get_bitmap_text_metrics(incoming_font)) { TEXTMETRICW *ptm = &incoming_font->potm->otmTextMetrics; @@ -6388,7 +6433,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); - if(FT_IS_SCALABLE(incoming_font->ft_face)) { + if(FT_IS_SCALABLE(incoming_font->ft_face) && !font->fake_bold) { TEXTMETRICW tm; if (get_text_metrics(incoming_font, &tm) && !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 17608ce..a629b10 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5700,7 +5700,7 @@ static void test_fake_bold_font(void) ok(tm[0].tmOverhang == tm[1].tmOverhang, "expected %d, got %d\n", tm[0].tmOverhang, tm[1].tmOverhang); w[0] = abc[0].abcA + abc[0].abcB + abc[0].abcC; w[1] = abc[1].abcA + abc[1].abcB + abc[1].abcC; - todo_wine ok((w[0] + 1) == w[1], "expected %d, got %d\n", w[0] + 1, w[1]); + ok((w[0] + 1) == w[1], "expected %d, got %d\n", w[0] + 1, w[1]); }

1 0

Dmitry Timoshkov : include: Redefine security privilege names without using TEXT macro.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: ebc7dcc630723c09e8f2f73f4364504025343907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc7dcc630723c09e8f2f73f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:50 2013 +0900 include: Redefine security privilege names without using TEXT macro. --- include/winnt.h | 152 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 123 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebc7dcc630723c09e8f2f…

1 0

Dmitry Timoshkov : kernel32/tests: Fix locale tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 020bd36323458ec0e910893ed96d6eac67d9273e URL: http://source.winehq.org/git/wine.git/?a=commit;h=020bd36323458ec0e910893ed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:07 2013 +0900 kernel32/tests: Fix locale tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/locale.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 130e4e5..417e7d6 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -72,9 +72,9 @@ static inline int isdigitW( WCHAR wc ) static HMODULE hKernel32; static WORD enumCount; -static BOOL (WINAPI *pEnumSystemLanguageGroupsA)(LANGUAGEGROUP_ENUMPROC, DWORD, LONG_PTR); -static BOOL (WINAPI *pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC, LGRPID, DWORD, LONG_PTR); -static BOOL (WINAPI *pEnumUILanguagesA)(UILANGUAGE_ENUMPROC, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumSystemLanguageGroupsA)(LANGUAGEGROUP_ENUMPROCA, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROCA, LGRPID, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumUILanguagesA)(UILANGUAGE_ENUMPROCA, DWORD, LONG_PTR); static BOOL (WINAPI *pEnumSystemLocalesEx)(LOCALE_ENUMPROCEX, DWORD, LPARAM, LPVOID); static INT (WINAPI *pLCMapStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPWSTR, INT, LPNLSVERSIONINFO, LPVOID, LPARAM); static LCID (WINAPI *pLocaleNameToLCID)(LPCWSTR, DWORD); @@ -118,7 +118,7 @@ static void InitFunctionPointers(void) #define COUNTOF(x) (sizeof(x)/sizeof(x)[0]) #define STRINGSA(x,y) strcpy(input, x); strcpy(Expected, y); SetLastError(0xdeadbeef); buffer[0] = '\0' -#define EXPECT_LENA ok(ret == lstrlen(Expected)+1, "Expected Len %d, got %d\n", lstrlen(Expected)+1, ret) +#define EXPECT_LENA ok(ret == lstrlenA(Expected)+1, "Expected len %d, got %d\n", lstrlenA(Expected)+1, ret) #define EXPECT_EQA ok(strncmp(buffer, Expected, strlen(Expected)) == 0, \ "Expected '%s', got '%s'\n", Expected, buffer) @@ -657,13 +657,13 @@ static void test_GetDateFormatA(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); STRINGSA("ddd',' MMM dd ''''yy","5/4/2002"); /* Default to DATE_SHORTDATE */ - ret = GetDateFormat(lcid, NUO, &curtime, NULL, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid, NUO, &curtime, NULL, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); if (strncmp(buffer, Expected, strlen(Expected)) && strncmp(buffer, "5/4/02", strlen(Expected)) != 0) ok (0, "Expected '%s' or '5/4/02', got '%s'\n", Expected, buffer); STRINGSA("ddd',' MMM dd ''''yy", "Saturday, May 04, 2002"); /* DATE_LONGDATE */ - ret = GetDateFormat(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENA; EXPECT_EQA; @@ -671,7 +671,7 @@ static void test_GetDateFormatA(void) /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */ STRINGSA("ddd',' MMM dd ''''yy", ""); /* DATE_YEARMONTH */ SetLastError(0xdeadbeef); - ret = GetDateFormat(lcid, NUO|DATE_YEARMONTH, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid, NUO|DATE_YEARMONTH, &curtime, input, buffer, COUNTOF(buffer)); ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); EXPECT_EQA; @@ -680,12 +680,12 @@ static void test_GetDateFormatA(void) /* and return values */ STRINGSA("m/d/y", ""); /* Invalid flags */ SetLastError(0xdeadbeef); - ret = GetDateFormat(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, + ret = GetDateFormatA(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, &curtime, input, buffer, COUNTOF(buffer)); ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - ret = GetDateFormat(lcid_ru, 0, &curtime, "ddMMMM", buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "ddMMMM", buffer, COUNTOF(buffer)); if (!ret) { win_skip("LANG_RUSSIAN locale data unavailable\n"); @@ -694,37 +694,37 @@ static void test_GetDateFormatA(void) /* month part should be in genitive form */ strcpy(genitive_month, buffer + 2); - ret = GetDateFormat(lcid_ru, 0, &curtime, "MMMM", buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMM", buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); strcpy(month, buffer); ok(strcmp(genitive_month, month) != 0, "Expected different month forms\n"); - ret = GetDateFormat(lcid_ru, 0, &curtime, "ddd", buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "ddd", buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); strcpy(short_day, buffer); STRINGSA("dd MMMMddd dd", ""); sprintf(Expected, "04 %s%s 04", genitive_month, short_day); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_EQA; STRINGSA("MMMMddd dd", ""); sprintf(Expected, "%s%s 04", month, short_day); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_EQA; STRINGSA("MMMMddd", ""); sprintf(Expected, "%s%s", month, short_day); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_EQA; STRINGSA("MMMMdd", ""); sprintf(Expected, "%s04", genitive_month); sprintf(Broken, "%s04", month); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, @@ -733,7 +733,7 @@ static void test_GetDateFormatA(void) STRINGSA("MMMMdd ddd", ""); sprintf(Expected, "%s04 %s", genitive_month, short_day); sprintf(Broken, "%s04 %s", month, short_day); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, @@ -741,14 +741,14 @@ static void test_GetDateFormatA(void) STRINGSA("dd dddMMMM", ""); sprintf(Expected, "04 %s%s", short_day, month); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_EQA; STRINGSA("dd dddMMMM ddd MMMMdd", ""); sprintf(Expected, "04 %s%s %s %s04", short_day, month, short_day, genitive_month); sprintf(Broken, "04 %s%s %s %s04", short_day, month, short_day, month); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, @@ -758,7 +758,7 @@ static void test_GetDateFormatA(void) STRINGSA("ddd',' MMMM dd", ""); sprintf(Expected, "%s, %s 04", short_day, genitive_month); sprintf(Broken, "%s, %s 04", short_day, month); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, @@ -1452,7 +1452,7 @@ static void test_CompareStringA(void) ret = CompareStringA(lcid, NORM_IGNORECASE, "_", -1, ".", -1); todo_wine ok(ret == CSTR_GREATER_THAN, "\"_\" vs \".\" expected CSTR_GREATER_THAN, got %d\n", ret); - ret = lstrcmpi("#", "."); + ret = lstrcmpiA("#", "."); todo_wine ok(ret == -1, "\"#\" vs \".\" expected -1, got %d\n", ret); lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);

1 0

Jacek Caban : crypt32: Return context_t from Context_CreateDataContext.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: e7ab43c4bbeb9515d69ea84833de325063907997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ab43c4bbeb9515d69ea8483… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 21 15:58:56 2013 +0200 crypt32: Return context_t from Context_CreateDataContext. --- dlls/crypt32/cert.c | 48 ++++++++++++++++++--------------------- dlls/crypt32/context.c | 4 +- dlls/crypt32/crl.c | 49 ++++++++++++++++++--------------------- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/ctl.c | 26 +++++++++++--------- 5 files changed, 62 insertions(+), 67 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f2889f9..f23629b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -129,14 +129,12 @@ static context_t *Cert_clone(context_t *context, WINECRYPT_CERTSTORE *store, BOO return NULL; }else { const cert_t *cloned = (const cert_t*)context; - void *new_context; DWORD size = 0; BOOL res; - new_context = Context_CreateDataContext(sizeof(CERT_CONTEXT), &cert_vtbl, store); - if(!new_context) + cert = (cert_t*)Context_CreateDataContext(sizeof(CERT_CONTEXT), &cert_vtbl, store); + if(!cert) return NULL; - cert = cert_from_ptr(new_context); Context_CopyProperties(&cert->ctx, &cloned->ctx); @@ -312,7 +310,8 @@ BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, const BYTE *pbCertEncoded, DWORD cbCertEncoded) { - PCERT_CONTEXT cert = NULL; + cert_t *cert = NULL; + BYTE *data = NULL; BOOL ret; PCERT_INFO certInfo = NULL; DWORD size = 0; @@ -329,30 +328,27 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED, pbCertEncoded, cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &certInfo, &size); - if (ret) - { - BYTE *data = NULL; + if (!ret) + return NULL; - cert = Context_CreateDataContext(sizeof(CERT_CONTEXT), &cert_vtbl, &empty_store); - if (!cert) - goto end; - data = CryptMemAlloc(cbCertEncoded); - if (!data) - { - CertFreeCertificateContext(cert); - cert = NULL; - goto end; - } - memcpy(data, pbCertEncoded, cbCertEncoded); - cert->dwCertEncodingType = dwCertEncodingType; - cert->pbCertEncoded = data; - cert->cbCertEncoded = cbCertEncoded; - cert->pCertInfo = certInfo; - cert->hCertStore = &empty_store; + cert = (cert_t*)Context_CreateDataContext(sizeof(CERT_CONTEXT), &cert_vtbl, &empty_store); + if (!cert) + return NULL; + data = CryptMemAlloc(cbCertEncoded); + if (!data) + { + Context_Release(&cert->base); + return NULL; } -end: - return cert; + memcpy(data, pbCertEncoded, cbCertEncoded); + cert->ctx.dwCertEncodingType = dwCertEncodingType; + cert->ctx.pbCertEncoded = data; + cert->ctx.cbCertEncoded = cbCertEncoded; + cert->ctx.pCertInfo = certInfo; + cert->ctx.hCertStore = &empty_store; + + return &cert->ctx; } PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext(PCCERT_CONTEXT pCertContext) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 6dc46c2..9c26439 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(context); -void *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl, WINECRYPT_CERTSTORE *store) +context_t *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl, WINECRYPT_CERTSTORE *store) { context_t *context; @@ -48,7 +48,7 @@ void *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl, context->store = store; TRACE("returning %p\n", context); - return context_ptr(context); + return context; } context_t *Context_CreateLinkContext(unsigned int contextSize, context_t *linked, WINECRYPT_CERTSTORE *store) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 8eb587a..07e86b2 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -49,14 +49,12 @@ static context_t *CRL_clone(context_t *context, WINECRYPT_CERTSTORE *store, BOOL return NULL; }else { const crl_t *cloned = (const crl_t*)context; - void *new_context; DWORD size = 0; BOOL res; - new_context = Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, store); - if(!new_context) + crl = (crl_t*)Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, store); + if(!crl) return NULL; - crl = crl_from_ptr(new_context); Context_CopyProperties(&crl->ctx, &cloned->ctx); @@ -87,9 +85,10 @@ static const context_vtbl_t crl_vtbl = { PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, const BYTE* pbCrlEncoded, DWORD cbCrlEncoded) { - PCRL_CONTEXT crl = NULL; + crl_t *crl = NULL; BOOL ret; PCRL_INFO crlInfo = NULL; + BYTE *data = NULL; DWORD size = 0; TRACE("(%08x, %p, %d)\n", dwCertEncodingType, pbCrlEncoded, @@ -103,30 +102,28 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, pbCrlEncoded, cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &crlInfo, &size); - if (ret) - { - BYTE *data = NULL; + if (!ret) + return NULL; - crl = Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, &empty_store); - if (!crl) - goto end; - data = CryptMemAlloc(cbCrlEncoded); - if (!data) - { - CertFreeCRLContext(crl); - crl = NULL; - goto end; - } - memcpy(data, pbCrlEncoded, cbCrlEncoded); - crl->dwCertEncodingType = dwCertEncodingType; - crl->pbCrlEncoded = data; - crl->cbCrlEncoded = cbCrlEncoded; - crl->pCrlInfo = crlInfo; - crl->hCertStore = &empty_store; + crl = (crl_t*)Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, &empty_store); + if (!crl) + return NULL; + + data = CryptMemAlloc(cbCrlEncoded); + if (!data) + { + Context_Release(&crl->base); + return NULL; } -end: - return crl; + memcpy(data, pbCrlEncoded, cbCrlEncoded); + crl->ctx.dwCertEncodingType = dwCertEncodingType; + crl->ctx.pbCrlEncoded = data; + crl->ctx.cbCrlEncoded = cbCrlEncoded; + crl->ctx.pCrlInfo = crlInfo; + crl->ctx.hCertStore = &empty_store; + + return &crl->ctx; } BOOL WINAPI CertAddEncodedCRLToStore(HCERTSTORE hCertStore, diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 2dbc1ce..53e0834 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -389,7 +389,7 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indent, * which should be one of CERT_CONTEXT, CRL_CONTEXT, or CTL_CONTEXT. * Free with Context_Release. */ -void *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl, struct WINE_CRYPTCERTSTORE*) DECLSPEC_HIDDEN; +context_t *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl, struct WINE_CRYPTCERTSTORE*) DECLSPEC_HIDDEN; /* Creates a new link context. The context refers to linked * rather than owning its own properties. If addRef is TRUE (which ordinarily diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 7a8c21f..6893e2d 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -367,7 +367,7 @@ BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded) { - PCTL_CONTEXT ctl = NULL; + ctl_t *ctl = NULL; HCRYPTMSG msg; BOOL ret; BYTE *content = NULL; @@ -440,7 +440,7 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, &ctlInfo, &size); if (ret) { - ctl = Context_CreateDataContext(sizeof(CTL_CONTEXT), &ctl_vtbl, &empty_store); + ctl = (ctl_t*)Context_CreateDataContext(sizeof(CTL_CONTEXT), &ctl_vtbl, &empty_store); if (ctl) { BYTE *data = CryptMemAlloc(cbCtlEncoded); @@ -448,15 +448,15 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, if (data) { memcpy(data, pbCtlEncoded, cbCtlEncoded); - ctl->dwMsgAndCertEncodingType = + ctl->ctx.dwMsgAndCertEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; - ctl->pbCtlEncoded = data; - ctl->cbCtlEncoded = cbCtlEncoded; - ctl->pCtlInfo = ctlInfo; - ctl->hCertStore = &empty_store; - ctl->hCryptMsg = msg; - ctl->pbCtlContext = content; - ctl->cbCtlContext = contentSize; + ctl->ctx.pbCtlEncoded = data; + ctl->ctx.cbCtlEncoded = cbCtlEncoded; + ctl->ctx.pCtlInfo = ctlInfo; + ctl->ctx.hCertStore = &empty_store; + ctl->ctx.hCryptMsg = msg; + ctl->ctx.pbCtlContext = content; + ctl->ctx.cbCtlContext = contentSize; } else { @@ -481,13 +481,15 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, end: if (!ret) { - CertFreeCTLContext(ctl); + if(ctl) + Context_Release(&ctl->base); ctl = NULL; LocalFree(ctlInfo); CryptMemFree(content); CryptMsgClose(msg); + return NULL; } - return ctl; + return &ctl->ctx; } PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext)

1 0