November 2014 - Wine-commits

Nikolay Sivov : dwrite: Use stream fragment context when reading font tables.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 31496c600d1963b1df827ed8362151942272d361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31496c600d1963b1df827ed83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 26 09:27:38 2014 +0300 dwrite: Use stream fragment context when reading font tables. --- dlls/dwrite/font.c | 38 ++------------------------------------ dlls/dwrite/tests/font.c | 2 -- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 76f3e3e..073f11a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -91,14 +91,6 @@ struct dwrite_font { struct dwrite_font_data *data; }; -#define DWRITE_FONTTABLE_MAGIC 0xededfafa - -struct dwrite_fonttablecontext { - UINT32 magic; - void *context; - UINT32 file_index; -}; - struct dwrite_fonttable { void *data; void *context; @@ -359,45 +351,19 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace2 *iface, UI const void **table_data, UINT32 *table_size, void **context, BOOL *exists) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - struct dwrite_fonttablecontext *tablecontext; - HRESULT hr = S_OK; - int i; TRACE("(%p)->(%u %p %p %p %p)\n", This, table_tag, table_data, table_size, context, exists); - tablecontext = heap_alloc(sizeof(struct dwrite_fonttablecontext)); - if (!tablecontext) - return E_OUTOFMEMORY; - tablecontext->magic = DWRITE_FONTTABLE_MAGIC; - - *exists = FALSE; - for (i = 0; i < This->file_count && !(*exists); i++) { - hr = opentype_get_font_table(This->streams[i], This->type, This->index, table_tag, table_data, &tablecontext->context, table_size, exists); - tablecontext->file_index = i; - } - if (FAILED(hr) && !*exists) - heap_free(tablecontext); - else - *context = (void*)tablecontext; - - return hr; + return opentype_get_font_table(This->streams[0], This->type, This->index, table_tag, table_data, context, table_size, exists); } static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace2 *iface, void *table_context) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - struct dwrite_fonttablecontext *tablecontext = (struct dwrite_fonttablecontext*)table_context; TRACE("(%p)->(%p)\n", This, table_context); - if (tablecontext->magic != DWRITE_FONTTABLE_MAGIC) - { - TRACE("Invalid table magic\n"); - return; - } - - IDWriteFontFileStream_ReleaseFileFragment(This->streams[tablecontext->file_index], tablecontext->context); - heap_free(tablecontext); + IDWriteFontFileStream_ReleaseFileFragment(This->streams[0], table_context); } static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace2 *iface, FLOAT emSize, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 221a5d3..c14cf09 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2324,7 +2324,6 @@ static void test_TryGetFontTable(void) hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, &table, &size, &context, &exists); ok(hr == S_OK, "got 0x%08x\n",hr); ok(exists == TRUE, "got %d\n", exists); -todo_wine ok(context == NULL && table != NULL, "cmap: context %p, table %p\n", context, table); exists = FALSE; @@ -2333,7 +2332,6 @@ todo_wine hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, &table2, &size, &context2, &exists); ok(hr == S_OK, "got 0x%08x\n",hr); ok(exists == TRUE, "got %d\n", exists); -todo_wine ok(context2 == context && table2 == table, "cmap: context2 %p, table2 %p\n", context2, table2); IDWriteFontFace_ReleaseFontTable(fontface, context2);

1 0

Nikolay Sivov : dwrite: Remove DLL_WINE_PREATTACH case, native module can' t be used.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: c5af130e92a1609550c5d1c91b331170e40542a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5af130e92a1609550c5d1c91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 26 12:21:26 2014 +0300 dwrite: Remove DLL_WINE_PREATTACH case, native module can't be used. --- dlls/dwrite/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 79aa7d0..ac7aff5 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -41,8 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); init_freetype();

1 0

Nikolay Sivov : dwrite: Hide factory vtable selection in init helper.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 4b38ced13c055514e1fbb785b91f9eaf3f4e2e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b38ced13c055514e1fbb785b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 26 12:23:46 2014 +0300 dwrite: Hide factory vtable selection in init helper. --- dlls/dwrite/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ac7aff5..82a28d7 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1067,9 +1067,9 @@ static const struct IDWriteFactoryVtbl shareddwritefactoryvtbl = { dwritefactory_CreateGlyphRunAnalysis }; -static void init_dwritefactory(struct dwritefactory *factory, const struct IDWriteFactoryVtbl *vtbl) +static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYPE type) { - factory->IDWriteFactory_iface.lpVtbl = vtbl; + factory->IDWriteFactory_iface.lpVtbl = type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl; factory->ref = 1; factory->localfontfileloader = NULL; factory->system_collection = NULL; @@ -1099,7 +1099,7 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno factory = heap_alloc(sizeof(struct dwritefactory)); if (!factory) return E_OUTOFMEMORY; - init_dwritefactory(factory, type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl); + init_dwritefactory(factory, type); if (type == DWRITE_FACTORY_TYPE_SHARED) if (InterlockedCompareExchangePointer((void**)&shared_factory, factory, NULL)) {

1 0

Nikolay Sivov : dwrite/tests: Fix some test failures on older dwrite versions.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 298f08d602bf37e2e37f574fcfc96aa96f119990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298f08d602bf37e2e37f574fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 27 09:26:45 2014 +0300 dwrite/tests: Fix some test failures on older dwrite versions. --- dlls/dwrite/tests/font.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c14cf09..3276b6d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2433,8 +2433,9 @@ static void test_CreateStreamFromKey(void) hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream2); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(stream == stream2, "got %p, %p\n", stream, stream2); - EXPECT_REF(stream, 2); + ok(stream == stream2 || broken(stream != stream2) /* Win7 SP0 */, "got %p, %p\n", stream, stream2); + if (stream == stream2) + EXPECT_REF(stream, 2); IDWriteFontFileStream_Release(stream); IDWriteFontFileStream_Release(stream2);

1 0

Nikolay Sivov : dwrite: Estimate x-height and cap height metrics if they' re missing.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 9afd55072f49a79fe3069e68fc5266ce32b04830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afd55072f49a79fe3069e68f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 27 12:51:04 2014 +0300 dwrite: Estimate x-height and cap height metrics if they're missing. --- dlls/dwrite/opentype.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a0f1c31..8a22699 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -866,12 +866,18 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po memset(metrics, 0, sizeof(*metrics)); + if (tt_head) { + metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); + metrics->glyphBoxLeft = GET_BE_WORD(tt_head->xMin); + metrics->glyphBoxTop = GET_BE_WORD(tt_head->yMax); + metrics->glyphBoxRight = GET_BE_WORD(tt_head->xMax); + metrics->glyphBoxBottom = GET_BE_WORD(tt_head->yMin); + } + if (tt_os2) { metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); metrics->descent = GET_BE_WORD(tt_os2->usWinDescent); metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); - metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); - metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight); metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); metrics->strikethroughThickness = GET_BE_WORD(tt_os2->yStrikeoutSize); metrics->subscriptPositionX = GET_BE_WORD(tt_os2->ySubscriptXOffset); @@ -883,20 +889,24 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po metrics->superscriptPositionY = GET_BE_WORD(tt_os2->ySuperscriptYOffset); metrics->superscriptSizeX = GET_BE_WORD(tt_os2->ySuperscriptXSize); metrics->superscriptSizeY = GET_BE_WORD(tt_os2->ySuperscriptYSize); - } - if (tt_head) { - metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); - metrics->glyphBoxLeft = GET_BE_WORD(tt_head->xMin); - metrics->glyphBoxTop = GET_BE_WORD(tt_head->yMax); - metrics->glyphBoxRight = GET_BE_WORD(tt_head->xMax); - metrics->glyphBoxBottom = GET_BE_WORD(tt_head->yMin); + /* version 2 fields */ + if (tt_os2->version >= 2) { + metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); + metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight); + } } if (tt_post) { metrics->underlinePosition = GET_BE_WORD(tt_post->underlinePosition); metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } + + /* estimate missing metrics */ + if (metrics->xHeight == 0) + metrics->xHeight = metrics->designUnitsPerEm / 2; + if (metrics->capHeight == 0) + metrics->capHeight = metrics->designUnitsPerEm * 7 / 10; } void opentype_get_font_properties(const void *os2, const void *head, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style)

1 0

Michael Stefaniuc : cmd: Remove duplicated if-check (PVS-Studio).
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 232390e5b885756a9e53092145009a60d8d0dc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232390e5b885756a9e5309214… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 27 11:27:33 2014 +0100 cmd: Remove duplicated if-check (PVS-Studio). --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6751d3e..992ca5c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3112,7 +3112,7 @@ void WCMD_rename (void) if (dotDst && (*(dotDst+1)=='*')) { if (dotSrc) strcatW(dest, dotSrc); } else if (dotDst) { - if (dotDst) strcatW(dest, dotDst); + strcatW(dest, dotDst); } WINE_TRACE("Source '%s'\n", wine_dbgstr_w(src));

1 0

Michael Stefaniuc : comdlg32: RT_DIALOG is already an INTRESOURCE ( PVS-Studio).
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 51d0345ebd8fd2291bfae039026a2de8202494d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d0345ebd8fd2291bfae0390… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 27 11:28:42 2014 +0100 comdlg32: RT_DIALOG is already an INTRESOURCE (PVS-Studio). --- dlls/comdlg32/printdlg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index bedd9c4..83b22c3 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3817,16 +3817,16 @@ static void *pagesetup_get_template(pagesetup_data *data) { if(data->unicode) res = FindResourceW(data->u.dlgw->hInstance, - data->u.dlgw->lpPageSetupTemplateName, MAKEINTRESOURCEW(RT_DIALOG)); + data->u.dlgw->lpPageSetupTemplateName, (LPWSTR)RT_DIALOG); else res = FindResourceA(data->u.dlga->hInstance, - data->u.dlga->lpPageSetupTemplateName, MAKEINTRESOURCEA(RT_DIALOG)); + data->u.dlga->lpPageSetupTemplateName, (LPSTR)RT_DIALOG); tmpl_handle = LoadResource(data->u.dlgw->hInstance, res); } else { res = FindResourceW(COMDLG32_hInstance, MAKEINTRESOURCEW(PAGESETUPDLGORD), - MAKEINTRESOURCEW(RT_DIALOG)); + (LPWSTR)RT_DIALOG); tmpl_handle = LoadResource(COMDLG32_hInstance, res); } return LockResource(tmpl_handle);

1 0

Michael Stefaniuc : ieframe: IDC_ARROW is already an INTRESOURCE ( PVS-Studio).
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 908af25a6fa2d5941da1b7e9c190f7cecc50d303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908af25a6fa2d5941da1b7e9c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 27 11:29:40 2014 +0100 ieframe: IDC_ARROW is already an INTRESOURCE (PVS-Studio). --- dlls/ieframe/iexplore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 0bdb556..08bb167 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -707,7 +707,7 @@ void register_iewindow_class(void) wc.hIcon = LoadIconW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON)); wc.hIconSm = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); - wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDC_ARROW)); + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wc.hbrBackground = 0; wc.lpszClassName = szIEWinFrame; wc.lpszMenuName = NULL;

1 0

Michael Stefaniuc : msvcrt/tests: Don't open code offsetof().
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 42e6019c009b46dbc0862d43a4a220271ef98786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e6019c009b46dbc0862d43a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 27 11:30:28 2014 +0100 msvcrt/tests: Don't open code offsetof(). --- dlls/msvcrt/tests/headers.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 7c102b4..52d739e 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -66,11 +66,10 @@ #define TYPEOF(type) int #endif #define MSVCRT(x) MSVCRT_##x -#define OFFSET(T,F) ((unsigned int)((char *)&((struct T *)0L)->F - (char *)0L)) #define CHECK_SIZE(e) ok(sizeof(e) == sizeof(MSVCRT(e)), "Element has different sizes\n") #define CHECK_TYPE(t) { TYPEOF(t) a = 0; TYPEOF(MSVCRT(t)) b = a; a = b; CHECK_SIZE(t); } #define CHECK_STRUCT(s) ok(sizeof(struct s) == sizeof(struct MSVCRT(s)), "Struct has different sizes\n") -#define CHECK_FIELD(s,e) ok(OFFSET(s,e) == OFFSET(MSVCRT(s),e), "Bad offset\n") +#define CHECK_FIELD(s,e) ok(offsetof(struct s,e) == offsetof(struct MSVCRT(s),e), "Bad offset\n") #define CHECK_DEF(d) ok(d == MSVCRT_##d, "Defines (MSVCRT_)" #d " are different: %d vs. %d\n", d, MSVCRT_##d) /************* Checking types ***************/

1 0

Hans Leidekker : msi: Update version resource.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: e3143f11056c056df1a2b105e62ffa1f3449cee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3143f11056c056df1a2b105e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:15:22 2014 +0100 msi: Update version resource. --- dlls/msi/msi.rc | 8 ++++---- programs/msiexec/rsrc.rc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 24587e9..e52fac5 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -79,9 +79,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine MSI dll" #define WINE_FILENAME_STR "msi.dll" -#define WINE_FILEVERSION 4,5,6001,22299 -#define WINE_FILEVERSION_STR "4.5.6001.22299" -#define WINE_PRODUCTVERSION 4,5,6001,22299 -#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" +#define WINE_FILEVERSION 4,5,6001,22308 +#define WINE_FILEVERSION_STR "4.5.6001.22308" +#define WINE_PRODUCTVERSION 4,5,6001,22308 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22308" #include "wine/wine_common_ver.rc" diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc index b9994ef..91c3df8 100644 --- a/programs/msiexec/rsrc.rc +++ b/programs/msiexec/rsrc.rc @@ -21,10 +21,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" #define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 4,5,6001,22299 -#define WINE_FILEVERSION_STR "4.5.6001.22299" -#define WINE_PRODUCTVERSION 4,5,6001,22299 -#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" +#define WINE_FILEVERSION 4,5,6001,22308 +#define WINE_FILEVERSION_STR "4.5.6001.22308" +#define WINE_PRODUCTVERSION 4,5,6001,22308 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22308" #define WINE_PRODUCTNAME_STR "Wine Installer" #include "wine/wine_common_ver.rc"

1 0