October 2013 - Wine-commits

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

21 Oct '13

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

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

21 Oct '13

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

Akihiro Sagawa : gdi32: Adjust fake bold outline font metrics.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: cab2cacb8e3828c9e451475d68ca550f092072f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab2cacb8e3828c9e451475d6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Oct 17 21:25:08 2013 +0900 gdi32: Adjust fake bold outline font metrics. --- dlls/gdi32/freetype.c | 5 ++++- dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b39f2ed..45723d3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7330,8 +7330,11 @@ static BOOL get_outline_text_metrics(GdiFont *font) } TM.tmMaxCharWidth = SCALE_X(ft_face->bbox.xMax - ft_face->bbox.xMin); TM.tmWeight = FW_REGULAR; - if (font->fake_bold) + if (font->fake_bold) { + TM.tmAveCharWidth++; + TM.tmMaxCharWidth++; TM.tmWeight = FW_BOLD; + } else { if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 854d68b..17608ce 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5693,9 +5693,9 @@ static void test_fake_bold_font(void) 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, + 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, + 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;

1 0

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

21 Oct '13

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

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

21 Oct '13

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

Piotr Caban : msvcrt: Make the first call to fwrite buffered.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: afec0b00bd6250fe21e8deccbc8116a4aca6a7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afec0b00bd6250fe21e8deccb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 21 16:11:31 2013 +0200 msvcrt: Make the first call to fwrite buffered. --- dlls/msvcrt/file.c | 133 +++++++++++++++++++++++++-------------------------- 1 files changed, 65 insertions(+), 68 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1594c33..89ac94c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3499,6 +3499,45 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f } /********************************************************************* + * _flsbuf (MSVCRT.@) + */ +int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) +{ + /* Flush output buffer */ + if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { + msvcrt_alloc_buffer(file); + } + if(!(file->_flag & MSVCRT__IOWRT)) { + if(file->_flag & MSVCRT__IORW) + file->_flag |= MSVCRT__IOWRT; + else + return MSVCRT_EOF; + } + if(file->_bufsiz) { + int res = 0; + + if(file->_cnt <= 0) + res = msvcrt_flush_buffer(file); + if(!res) { + *file->_ptr++ = c; + file->_cnt--; + } + + return res ? res : c&0xff; + } else { + unsigned char cc=c; + int len; + /* set _cnt to 0 for unbuffered FILEs */ + file->_cnt = 0; + len = MSVCRT__write(file->_file, &cc, 1); + if (len == 1) + return c & 0xff; + file->_flag |= MSVCRT__IOERR; + return MSVCRT_EOF; + } +} + +/********************************************************************* * fwrite (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) @@ -3509,38 +3548,36 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si return 0; MSVCRT__lock_file(file); - if(file->_cnt) { - int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; - memcpy(file->_ptr, ptr, pcnt); - file->_cnt -= pcnt; - file->_ptr += pcnt; - written = pcnt; - wrcnt -= pcnt; - ptr = (const char*)ptr + pcnt; - } else if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) { - file->_flag |= MSVCRT__IOWRT; - } else { - MSVCRT__unlock_file(file); - return 0; - } - } - if(wrcnt) { - int res; - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) - msvcrt_alloc_buffer(file); + while(wrcnt) { + if(file->_cnt) { + int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; + memcpy(file->_ptr, ptr, pcnt); + file->_cnt -= pcnt; + file->_ptr += pcnt; + written += pcnt; + wrcnt -= pcnt; + ptr = (const char*)ptr + pcnt; + } else if(!file->_bufsiz && (file->_flag & MSVCRT__IONBF)) { + if(!(file->_flag & MSVCRT__IOWRT)) { + if(file->_flag & MSVCRT__IORW) + file->_flag |= MSVCRT__IOWRT; + else + break; + } - /* Flush buffer */ - res=msvcrt_flush_buffer(file); - if(!res) { - int pwritten = MSVCRT__write(file->_file, ptr, wrcnt); - if (pwritten <= 0) - { + if(MSVCRT__write(file->_file, ptr, wrcnt) <= 0) { file->_flag |= MSVCRT__IOERR; - pwritten=0; + break; } - written += pwritten; + written += wrcnt; + wrcnt = 0; + } else { + if(MSVCRT__flsbuf(*(const char*)ptr, file) == MSVCRT_EOF) + break; + written++; + wrcnt--; + ptr = (const char*)ptr + 1; } } @@ -3700,46 +3737,6 @@ int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename, } /********************************************************************* - * _flsbuf (MSVCRT.@) - */ -int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) -{ - /* Flush output buffer */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { - msvcrt_alloc_buffer(file); - } - if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) - file->_flag |= MSVCRT__IOWRT; - else - return MSVCRT_EOF; - } - if(file->_bufsiz) { - int res = 0; - - if(file->_cnt <= 0) - res = msvcrt_flush_buffer(file); - if(!res) { - *file->_ptr++ = c; - file->_cnt--; - res = msvcrt_flush_buffer(file); - } - - return res ? res : c&0xff; - } else { - unsigned char cc=c; - int len; - /* set _cnt to 0 for unbuffered FILEs */ - file->_cnt = 0; - len = MSVCRT__write(file->_file, &cc, 1); - if (len == 1) - return c & 0xff; - file->_flag |= MSVCRT__IOERR; - return MSVCRT_EOF; - } -} - -/********************************************************************* * fputc (MSVCRT.@) */ int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file)

1 0

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

21 Oct '13

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

Jacek Caban : crypt32: Clone CRL context instead of using link in CertAddCRLContextToStore.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 0f57425a8ff0e16b8eaab9e03af73dcb1d40fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f57425a8ff0e16b8eaab9e03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 21 15:58:38 2013 +0200 crypt32: Clone CRL context instead of using link in CertAddCRLContextToStore. --- dlls/crypt32/crl.c | 39 ++++++++++++++++++++++++++++++++------- dlls/crypt32/store.c | 2 +- dlls/crypt32/tests/crl.c | 20 +++++++++++++++++++- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 4686e11..8eb587a 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -37,19 +37,44 @@ static void CRL_free(context_t *context) LocalFree(crl->ctx.pCrlInfo); } +static const context_vtbl_t crl_vtbl; + static context_t *CRL_clone(context_t *context, WINECRYPT_CERTSTORE *store, BOOL use_link) { crl_t *crl; - if(!use_link) { - FIXME("Only links supported\n"); - return NULL; + if(use_link) { + crl = (crl_t*)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store); + if(!crl) + 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) + return NULL; + crl = crl_from_ptr(new_context); + + Context_CopyProperties(&crl->ctx, &cloned->ctx); + + crl->ctx.dwCertEncodingType = cloned->ctx.dwCertEncodingType; + crl->ctx.pbCrlEncoded = CryptMemAlloc(cloned->ctx.cbCrlEncoded); + memcpy(crl->ctx.pbCrlEncoded, cloned->ctx.pbCrlEncoded, cloned->ctx.cbCrlEncoded); + crl->ctx.cbCrlEncoded = cloned->ctx.cbCrlEncoded; + + /* FIXME: We don't need to decode the object here, we could just clone crl info. */ + res = CryptDecodeObjectEx(crl->ctx.dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, + crl->ctx.pbCrlEncoded, crl->ctx.cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, + &crl->ctx.pCrlInfo, &size); + if(!res) { + CertFreeCRLContext(&crl->ctx); + return NULL; + } } - crl = (crl_t*)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store); - if(!crl) - return NULL; - crl->ctx.hCertStore = store; return &crl->base; } diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 70c9150..7e22b95 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1074,7 +1074,7 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, if (store) { context_t *ret_context; ret = store->vtbl->crls.addContext(store, context_from_ptr(toAdd), - existing ? context_from_ptr(existing) : NULL, ppStoreContext ? &ret_context : NULL, TRUE); + existing ? context_from_ptr(existing) : NULL, ppStoreContext ? &ret_context : NULL, FALSE); if (ret && ppStoreContext) *ppStoreContext = context_ptr(ret_context); }else if (ppStoreContext) { diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index f39d02e..9515c38 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -144,7 +144,7 @@ static void testAddCRL(void) { HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - PCCRL_CONTEXT context; + PCCRL_CONTEXT context, context2; BOOL ret; DWORD GLE; @@ -229,6 +229,24 @@ static void testAddCRL(void) ok(ret, "CertAddEncodedCRLToStore failed: %08x\n", GetLastError()); CertCloseStore(store, 0); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed\n"); + + context = CertCreateCRLContext(X509_ASN_ENCODING, CRL, sizeof(CRL)); + ok(context != NULL, "CertCreateCRLContext failed\n"); + + ret = CertAddCRLContextToStore(store, context, CERT_STORE_ADD_NEW, &context2); + ok(ret, "CertAddCRLContextToStore failed\n"); + ok(context2 != NULL && context2 != context, "unexpected context2\n"); + + ok(context->pbCrlEncoded != context2->pbCrlEncoded, "Unexpected pbCrlEncoded\n"); + ok(context->cbCrlEncoded == context2->cbCrlEncoded, "Unexpected cbCrlEncoded\n"); + ok(context->pCrlInfo != context2->pCrlInfo, "Unexpected pCrlInfo\n"); + + CertFreeCRLContext(context2); + CertFreeCRLContext(context); + CertCloseStore(store, 0); } static const BYTE v1CRLWithIssuerAndEntry[] = { 0x30, 0x44, 0x30, 0x02, 0x06,

1 0

Jacek Caban : crypt32: Return context_t from Context_CreateDataContext.
by Alexandre Julliard 21 Oct '13

21 Oct '13

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

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

21 Oct '13

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